[Pkg-owncloud-commits] [owncloud-doc] 108/110: Merge remote-tracking branch 'upstream/stable7' into upstream
David Prévot
taffit at moszumanska.debian.org
Fri Feb 6 21:10:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-doc.
commit 4881b863bb18182938eece0a968a362af01ed4aa
Merge: 5db452c c76dac0
Author: David Prévot <david at tilapin.org>
Date: Fri Feb 6 10:33:18 2015 -0400
Merge remote-tracking branch 'upstream/stable7' into upstream
Conflicts:
user_manual/images/oc_ui.png
user_manual/images/owncloud_webinterface_map.png
CONTRIBUTING.rst | 13 +-
.../background_jobs_configuration.rst | 6 +-
.../big_file_upload_configuration.rst | 94 +++---
.../configuration/config_sample_php_parameters.rst | 39 ++-
.../configuration/database_configuration.rst | 6 +-
.../configuration/encryption_configuration.rst | 5 +-
.../external_storage_configuration.rst | 80 ++++-
.../external_storage_configuration_gui.rst | 11 +-
admin_manual/configuration/index.rst | 5 +-
admin_manual/configuration/occ_command.rst | 262 ++++++++++++++++
.../configuration/reset_admin_password.rst | 35 +++
admin_manual/configuration/user_auth_ldap.rst | 4 +-
.../configuration/user_auth_ldap_cleanup.rst | 68 +++++
admin_manual/contents.rst | 3 +-
.../images/100000000000063F00000090AAE1FA4A.png | Bin 5022 -> 0 bytes
.../images/build-a-cloud-of-servers-320.png | Bin 0 -> 13713 bytes
admin_manual/images/oc-video-1.png | Bin 0 -> 48076 bytes
admin_manual/images/oc-video-2.png | Bin 0 -> 28469 bytes
admin_manual/index.rst | 9 +
.../images/install-wizard-advanced.png | Bin 107639 -> 38149 bytes
.../installation/images/install-wizard.png | Bin 86115 -> 27709 bytes
admin_manual/installation/index.rst | 4 +-
admin_manual/installation/installation_wizard.rst | 181 +++++++----
admin_manual/installation/linux_installation.rst | 24 +-
admin_manual/installation/source_installation.rst | 134 +++-----
admin_manual/installation/windows_installation.rst | 4 +-
admin_manual/issues/index.rst | 26 +-
admin_manual/maintenance/convert_db.rst | 58 ++--
admin_manual/maintenance/enable_maintenance.rst | 24 +-
admin_manual/maintenance/update.rst | 83 +++--
admin_manual/maintenance/upgrade.rst | 44 ++-
admin_manual/videos.rst | 48 +++
developer_manual/app/api.rst | 2 +-
developer_manual/app/container.rst | 6 +-
developer_manual/app/controllers.rst | 2 +-
developer_manual/app/middleware.rst | 72 -----
developer_manual/app/routes.rst | 2 +-
developer_manual/app/testing.rst | 13 +-
developer_manual/bugtracker/codereviews.rst | 12 +-
developer_manual/core/unit-testing.rst | 48 +--
developer_manual/general/backporting.rst | 23 ++
developer_manual/general/index.rst | 1 +
index/index.rst | 4 +-
user_manual/contents.rst | 10 +-
user_manual/files/files.rst | 338 ++++++++++++---------
user_manual/files/filesweb.rst | 28 +-
user_manual/images/apis_auth_google_drive.png | Bin 43232 -> 0 bytes
user_manual/images/bookmark_list.jpg | Bin 9140 -> 0 bytes
user_manual/images/caldav.png | Bin 338 -> 0 bytes
.../images/calendar_create_event_advanced.png | Bin 12664 -> 0 bytes
.../calendar_create_event_repeat_advanced.png | Bin 9287 -> 0 bytes
user_manual/images/calendar_createevent.png | Bin 13663 -> 0 bytes
user_manual/images/calendar_manage-calendars.png | Bin 34730 -> 0 bytes
user_manual/images/calendar_share.png | Bin 16185 -> 0 bytes
user_manual/images/chain-link-on-public-share.png | Bin 5195 -> 0 bytes
user_manual/images/contact_del_ab.png | Bin 10105 -> 0 bytes
user_manual/images/contact_emptycontact.png | Bin 11879 -> 0 bytes
user_manual/images/contact_picture.jpg | Bin 5766 -> 0 bytes
user_manual/images/cross.png | Bin 181 -> 0 bytes
user_manual/images/dolphin_webdav.png | Bin 34597 -> 0 bytes
user_manual/images/email_server_smtp_wizard.png | Bin 13839 -> 0 bytes
.../images/external_google_drive_1_sign_in.png | Bin 26480 -> 0 bytes
.../images/external_google_drive_2_verify.png | Bin 15526 -> 0 bytes
.../external_google_drive_3_create_project.png | Bin 8244 -> 0 bytes
.../images/external_google_drive_4_enable_api.png | Bin 9818 -> 0 bytes
.../external_google_drive_5_setup_ownCloud.png | Bin 2820 -> 0 bytes
.../images/external_google_drive_6_accept.png | Bin 12736 -> 0 bytes
user_manual/images/gear.png | Bin 452 -> 0 bytes
user_manual/images/ios-app.png | Bin 0 -> 61504 bytes
user_manual/images/ios-betsyross.png | Bin 0 -> 196238 bytes
user_manual/images/ios-downloaded.png | Bin 0 -> 76589 bytes
user_manual/images/ios-files.png | Bin 0 -> 47798 bytes
user_manual/images/ios-settings.png | Bin 0 -> 45296 bytes
user_manual/images/ios-slider.png | Bin 0 -> 43761 bytes
user_manual/images/mail_templates.png | Bin 5141 -> 0 bytes
user_manual/images/nautilus_webdav.png | Bin 32555 -> 0 bytes
user_manual/images/new_project_google_drive.png | Bin 12943 -> 0 bytes
.../new_project_google_drive_api_settings.png | Bin 18752 -> 0 bytes
.../images/new_project_google_drive_branding.png | Bin 96104 -> 0 bytes
.../images/new_project_google_drive_new_client.png | Bin 20733 -> 0 bytes
user_manual/images/oc_apps_dropdown.png | Bin 29080 -> 0 bytes
user_manual/images/oc_edit.png | Bin 27248 -> 0 bytes
user_manual/images/oc_files_share.png | Bin 11553 -> 0 bytes
user_manual/images/oc_filesweb.png | Bin 17316 -> 0 bytes
.../images/oc_share_expiration_calendar.png | Bin 12932 -> 0 bytes
user_manual/images/oc_share_with_options.png | Bin 7839 -> 0 bytes
user_manual/images/oc_ui.png | Bin 45125 -> 0 bytes
user_manual/images/owncloud_webinterface_map.png | Bin 11897 -> 0 bytes
user_manual/images/pencil.png | Bin 193 -> 0 bytes
user_manual/images/remote_shares.png | Bin 6872 -> 0 bytes
user_manual/images/s2s_share_link.png | Bin 14435 -> 0 bytes
user_manual/images/share.png | Bin 264 -> 0 bytes
user_manual/images/share_link.png | Bin 14435 -> 0 bytes
user_manual/images/share_link_adding.png | Bin 18257 -> 0 bytes
user_manual/images/users-share-public2.jpg | Bin 0 -> 116565 bytes
user_manual/images/users-share-public3.jpg | Bin 0 -> 24366 bytes
user_manual/images/version_personal_settings.png | Bin 7519 -> 0 bytes
user_manual/images/webdav_dolphin.png | Bin 0 -> 31003 bytes
...tilus_webdav.png => webdav_gnome3_nautilus.png} | Bin
user_manual/index.rst | 14 +-
user_manual/installing_apps.rst | 19 --
user_manual/pim/troubleshooting.rst | 2 +-
102 files changed, 1267 insertions(+), 599 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git
More information about the Pkg-owncloud-commits
mailing list