[Pkg-owncloud-commits] [owncloud] 31/34: Merge tag 'upstream/7.0.3_rc1+dfsg'

David Prévot taffit at moszumanska.debian.org
Fri Oct 17 01:32:18 UTC 2014


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

taffit pushed a commit to branch master
in repository owncloud.

commit 38e046a8b56432b6353a4b408ca3dd9346339e19
Merge: 6444416 640fc64
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 16 09:47:10 2014 -0400

    Merge tag 'upstream/7.0.3_rc1+dfsg'
    
    Upstream version 7.0.3~rc1+dfsg
    
    # gpg: Signature faite le jeu. 16 oct. 2014 09:46:53 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/appinfo/info.xml                     |   4 +-
 apps/activity/l10n/ast.php                         |   1 -
 apps/activity/l10n/az.php                          |  11 +-
 apps/activity/l10n/bg_BG.php                       |   7 +-
 apps/activity/l10n/bn_BD.php                       |   3 +-
 apps/activity/l10n/bn_IN.php                       |   1 -
 apps/activity/l10n/ca.php                          |   1 -
 apps/activity/l10n/cs_CZ.php                       |  11 +-
 apps/activity/l10n/da.php                          |  11 +-
 apps/activity/l10n/de.php                          |   7 +-
 apps/activity/l10n/de_DE.php                       |   9 +-
 apps/activity/l10n/el.php                          |   7 +-
 apps/activity/l10n/en_GB.php                       |   7 +-
 apps/activity/l10n/es.php                          |   7 +-
 apps/activity/l10n/es_AR.php                       |   1 -
 apps/activity/l10n/es_CL.php                       |   1 -
 apps/activity/l10n/et_EE.php                       |   1 -
 apps/activity/l10n/eu.php                          |   1 -
 apps/activity/l10n/fa.php                          |   1 -
 apps/activity/l10n/fi_FI.php                       |   7 +-
 apps/activity/l10n/fr.php                          |  18 +-
 apps/activity/l10n/gl.php                          |   1 -
 apps/activity/l10n/he.php                          |   1 -
 apps/activity/l10n/hr.php                          |  49 ++++-
 apps/activity/l10n/hu_HU.php                       |   1 -
 apps/activity/l10n/ia.php                          |   9 +-
 apps/activity/l10n/it.php                          |   7 +-
 apps/activity/l10n/ja.php                          |   8 +-
 apps/activity/l10n/km.php                          |   1 -
 apps/activity/l10n/lt_LT.php                       |   9 +-
 apps/activity/l10n/ml_IN.php                       |   1 -
 apps/activity/l10n/nb_NO.php                       |   9 +-
 apps/activity/l10n/nl.php                          |   7 +-
 apps/activity/l10n/nn_NO.php                       |   1 -
 apps/activity/l10n/pl.php                          |   7 +-
 apps/activity/l10n/pt_BR.php                       |   7 +-
 apps/activity/l10n/pt_PT.php                       |   7 +-
 apps/activity/l10n/ro.php                          |   2 +-
 apps/activity/l10n/ru.php                          |   7 +-
 apps/activity/l10n/sk_SK.php                       |   2 +-
 apps/activity/l10n/sl.php                          |   7 +-
 apps/activity/l10n/sv.php                          |   1 -
 apps/activity/l10n/ta_IN.php                       |   1 -
 apps/activity/l10n/tr.php                          |   7 +-
 apps/activity/l10n/zh_CN.php                       |   9 +-
 apps/activity/lib/data.php                         |   2 +
 apps/activity/lib/datahelper.php                   |   4 +
 apps/activity/lib/grouphelper.php                  |   2 +
 apps/activity/lib/hooks.php                        |   9 +
 apps/activity/lib/mailqueuehandler.php             |  31 ++-
 apps/activity/lib/usersettings.php                 |   3 +-
 apps/activity/templates/activity.box.php           |   2 +-
 apps/activity/templates/email.notification.php     |   9 +-
 apps/activity/tests/usersettingstest.php           |   2 +-
 apps/calendar/appinfo/info.xml                     |   3 +
 .../js/3rdparty/webodf/editor/EditorSession.js     |   2 +
 apps/documents/src/patches/fontsCssPath.patch      |   7 +-
 apps/files/js/filelist.js                          |   8 +-
 apps/files_encryption/files/error.php              |   3 +
 apps/files_encryption/lib/proxy.php                |   4 +-
 apps/files_encryption/tests/proxy.php              |  12 +-
 apps/files_external/lib/owncloud.php               |   8 +
 apps/files_external/tests/owncloudfunctions.php    |  83 ++++++++
 apps/files_sharing/public.php                      |   2 +-
 apps/files_trashbin/lib/trashbin.php               |  18 +-
 config/config.sample.php                           |   7 +
 .../configuration/configuration-antivirus.txt      |  21 +-
 .../configuration/configuration_file_sharing.txt   |   6 +-
 .../_sources/configuration/configuration_mail.txt  |   6 +-
 .../_sources/configuration/configuration_users.txt |  36 +++-
 .../_sources/installation/configuration_nginx.txt  |   2 +-
 core/doc/admin/_sources/whats_new_admin.txt        |  26 ++-
 .../configuration/configuration-antivirus.html     |  22 +--
 .../configuration/configuration_file_sharing.html  |   6 +-
 .../admin/configuration/configuration_mail.html    |   4 +-
 .../admin/configuration/configuration_users.html   |  32 ++-
 core/doc/admin/contents.html                       |   2 +-
 .../admin/installation/configuration_nginx.html    |   2 +-
 core/doc/admin/whats_new_admin.html                |  27 ++-
 core/doc/user/_sources/contents.txt                |   2 +-
 core/doc/user/_sources/documents.txt               |   3 +-
 core/doc/user/_sources/files/filesweb.txt          |  12 +-
 core/doc/user/bookmarks.html                       |   6 +-
 core/doc/user/contents.html                        |  22 +--
 core/doc/user/documents.html                       |   9 +-
 core/doc/user/external_storage/google_drive.html   |   2 +-
 .../user/files/configuring_big_file_upload.html    |   2 +-
 core/doc/user/files/deletedfiles.html              |   2 +-
 core/doc/user/files/encryption.html                |   2 +-
 core/doc/user/files/files.html                     |   2 +-
 core/doc/user/files/filesweb.html                  |  13 +-
 core/doc/user/files/index.html                     |   2 +-
 core/doc/user/files/quota.html                     |   2 +-
 core/doc/user/files/server_to_server_using.html    |   2 +-
 core/doc/user/files/sync.html                      |   2 +-
 core/doc/user/files/versioncontrol.html            |   2 +-
 core/doc/user/genindex.html                        |   2 +-
 core/doc/user/index.html                           |   2 +-
 core/doc/user/migration.html                       |   4 +-
 core/doc/user/pim/calendar.html                    |   2 +-
 core/doc/user/pim/contacts.html                    |   2 +-
 core/doc/user/pim/index.html                       |   2 +-
 core/doc/user/pim/sync_ios.html                    |   2 +-
 core/doc/user/pim/sync_kde.html                    |   2 +-
 core/doc/user/pim/sync_osx.html                    |   2 +-
 core/doc/user/pim/sync_thunderbird.html            |   2 +-
 core/doc/user/pim/troubleshooting.html             |   4 +-
 core/doc/user/search.html                          |   2 +-
 core/doc/user/userpreferences.html                 |   2 +-
 core/doc/user/webinterface.html                    |   2 +-
 core/doc/user/whats_new.html                       |   2 +-
 lib/private/files/cache/changepropagator.php       |   8 +-
 lib/private/files/cache/homecache.php              |   3 +
 lib/private/files/cache/storage.php                |   2 +-
 lib/private/files/cache/updater.php                | 214 +++++++--------------
 lib/private/files/storage/dav.php                  |   4 +-
 lib/private/files/view.php                         |  67 ++++---
 lib/private/largefilehelper.php                    |   4 +-
 lib/private/setup.php                              |   2 +-
 lib/private/share/share.php                        |   5 +-
 lib/private/urlgenerator.php                       |   4 +
 settings/admin/controller.php                      | 123 ------------
 settings/application.php                           |  70 +++++++
 settings/apps.php                                  |   1 +
 settings/controller/mailsettingscontroller.php     | 166 ++++++++++++++++
 settings/css/settings.css                          |   4 +-
 settings/js/admin.js                               |  12 +-
 settings/routes.php                                |  17 +-
 settings/templates/admin.php                       | 150 ++++++++-------
 version.php                                        |   8 +-
 130 files changed, 1062 insertions(+), 614 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