[Pkg-owncloud-commits] [owncloud] 30/38: Merge tag 'upstream/7.0.5+dfsg'

David Prévot taffit at moszumanska.debian.org
Wed Mar 11 15:16:31 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 69351e6d44241243ce28e6cc26c08f75d5e80eb6
Merge: 61da1fe 3a7cee1
Author: David Prévot <taffit at debian.org>
Date:   Wed Mar 11 09:46:15 2015 -0400

    Merge tag 'upstream/7.0.5+dfsg'
    
    Upstream version 7.0.5+dfsg
    
    # gpg: Signature faite le mer. 11 mars 2015 09:44:46 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 apps/activity/js/script.js                         |  14 +-
 apps/contacts/js/contacts.js                       |   4 +-
 apps/documents/js/3rdparty/resources/dojo/dojo.js  | 664 ---------------------
 apps/files_trashbin/js/filelist.js                 |   4 +
 apps/firstrunwizard/templates/wizard.php           |   2 +-
 config/config.sample.php                           |  12 +-
 console.php                                        |   3 +
 .../admin/release/_images/documents_apply_test.png | Bin 0 -> 20493 bytes
 .../big_file_upload_configuration.txt              |  31 +-
 .../collaborative_documents_configuration.txt      |  26 +-
 .../configuration/config_sample_php_parameters.txt |  46 +-
 .../external_storage_configuration.txt             |  11 +
 .../external_storage_configuration_gui.txt         |   7 +
 .../admin/release/_sources/configuration/index.txt |   3 +-
 .../release/_sources/configuration/occ_command.txt |  17 +-
 .../_sources/configuration/performance_tips.txt    | 270 +++++++++
 .../server_to_server_configuration.txt             |   9 +-
 .../configuration/user_auth_ftp_smb_imap.txt       |   4 +-
 .../_sources/installation/linux_installation.txt   |   2 +
 .../installation/selinux_configuration.txt         |   6 +
 .../_sources/installation/source_installation.txt  |  23 +-
 core/doc/admin/release/_sources/issues/index.txt   |  17 +-
 .../admin/release/_sources/maintenance/backup.txt  |   2 +-
 .../configuration/antivirus_configuration.html     |   2 +-
 .../configuration/automatic_configuration.html     |   2 +-
 .../background_jobs_configuration.html             |   2 +-
 .../big_file_upload_configuration.html             |  38 +-
 .../collaborative_documents_configuration.html     |  33 +-
 .../config_sample_php_parameters.html              |  50 +-
 .../configuration/custom_client_configuration.html |   2 +-
 .../configuration/database_configuration.html      |   2 +-
 .../release/configuration/email_configuration.html |   2 +-
 .../configuration/encryption_configuration.html    |   2 +-
 .../external_storage_configuration.html            |  15 +-
 .../external_storage_configuration_gui.html        |   9 +-
 .../configuration/file_sharing_configuration.html  |   2 +-
 .../configuration/files_locking_enabling.html      |   2 +-
 core/doc/admin/release/configuration/index.html    |  23 +-
 .../js_css_asset_management_configuration.html     |   2 +-
 .../configuration/knowledgebase_configuration.html |   2 +-
 .../configuration/language_configuration.html      |   2 +-
 .../configuration/logging_configuration.html       |   2 +-
 .../admin/release/configuration/occ_command.html   |  21 +-
 .../release/configuration/performance_tips.html    | 541 +++++++++++++++++
 .../configuration/previews_configuration.html      |   4 +-
 .../configuration/reset_admin_password.html        |   2 +-
 .../configuration/reverse_proxy_configuration.html |   2 +-
 .../configuration/search_configuration.html        |   2 +-
 .../server_to_server_configuration.html            |  10 +-
 .../serving_static_files_configuration.html        |   2 +-
 .../thirdparty_php_configuration.html              |   2 +-
 .../configuration/user_auth_ftp_smb_imap.html      |   6 +-
 .../release/configuration/user_auth_ldap.html      |   2 +-
 .../configuration/user_auth_ldap_cleanup.html      |   2 +-
 .../release/configuration/user_configuration.html  |   2 +-
 core/doc/admin/release/contents.html               |  28 +-
 core/doc/admin/release/installation/index.html     |   6 +-
 .../release/installation/linux_installation.html   |   2 +
 .../installation/selinux_configuration.html        |  11 +-
 .../release/installation/source_installation.html  |  18 +-
 core/doc/admin/release/issues/index.html           |  19 +-
 core/doc/admin/release/maintenance/backup.html     |   2 +-
 core/doc/user/_sources/files/files.txt             |  16 +-
 core/doc/user/_sources/index.txt                   |   3 +-
 core/doc/user/_sources/pim/calendar.txt            |  13 +
 core/doc/user/_sources/pim/contacts.txt            |   9 +
 core/doc/user/contents.html                        |   2 +
 core/doc/user/files/files.html                     |  13 +-
 core/doc/user/pim/calendar.html                    |  11 +
 core/doc/user/pim/contacts.html                    |   8 +
 core/img/actions/caret.png                         | Bin 2876 -> 0 bytes
 core/img/actions/logout.png                        | Bin 3071 -> 0 bytes
 core/l10n/az.php                                   |   3 +-
 core/l10n/bn_IN.php                                |   3 +-
 lib/l10n/ur.php                                    |   8 -
 lib/private/defaults.php                           |  10 +-
 lib/private/files/filesystem.php                   |   9 +-
 lib/private/files/mapper.php                       |   6 +-
 lib/private/preview.php                            |   4 +-
 lib/private/preview/{movies.php => movie.php}      |   0
 lib/private/share/share.php                        |  10 +-
 lib/private/template.php                           |   9 +-
 lib/private/updater.php                            |  40 +-
 lib/private/util.php                               |  10 +-
 settings/l10n/bg_BG.php                            |   2 +
 settings/l10n/bn_BD.php                            |   3 +-
 settings/l10n/cs_CZ.php                            |   2 +
 settings/l10n/da.php                               |   2 +
 settings/l10n/de.php                               |   2 +
 settings/l10n/de_DE.php                            |   2 +
 settings/l10n/el.php                               |   1 +
 settings/l10n/en_GB.php                            |   2 +
 settings/l10n/es.php                               |   2 +
 settings/l10n/et_EE.php                            |   2 +
 settings/l10n/eu.php                               |   1 +
 settings/l10n/fi_FI.php                            |   1 +
 settings/l10n/fr.php                               |   4 +-
 settings/l10n/gl.php                               |   2 +
 settings/l10n/id.php                               |   3 +-
 settings/l10n/it.php                               |   2 +
 settings/l10n/ja.php                               |   2 +
 settings/l10n/nb_NO.php                            |   1 +
 settings/l10n/nl.php                               |   2 +
 settings/l10n/pl.php                               |   1 +
 settings/l10n/pt_BR.php                            |   2 +
 settings/l10n/pt_PT.php                            |   2 +
 settings/l10n/ru.php                               |   4 +-
 settings/l10n/sk_SK.php                            |   2 +
 settings/l10n/sl.php                               |   4 +-
 settings/l10n/tr.php                               |   2 +
 settings/l10n/uk.php                               |   4 +-
 settings/l10n/zh_CN.php                            |   3 +-
 version.php                                        |   8 +-
 113 files changed, 1458 insertions(+), 854 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list