[Pkg-owncloud-commits] [owncloud] 17/22: Merge tag 'upstream/7.0.2+dfsg'

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit fb295a0dcd99ccb2aabfc45ebc7b16b0392e74d2
Merge: 2531797 e464eba
Author: David Prévot <taffit at debian.org>
Date:   Tue Aug 26 10:27:06 2014 -0400

    Merge tag 'upstream/7.0.2+dfsg'
    
    Upstream version 7.0.2+dfsg
    
    # gpg: Signature faite le mar. 26 août 2014 10:27:00 AST
    # gpg:                avec la clef RSA B82A217AFDFE09F2
    # 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

 apps/activity/l10n/az.php                          |   1 +
 apps/activity/l10n/bg_BG.php                       |   1 +
 apps/activity/l10n/cs_CZ.php                       |  33 ++---
 apps/activity/l10n/de.php                          |   1 +
 apps/activity/l10n/de_DE.php                       |   1 +
 apps/activity/l10n/el.php                          |   5 +-
 apps/activity/l10n/en_GB.php                       |   1 +
 apps/activity/l10n/es.php                          |   1 +
 apps/activity/l10n/eu.php                          |   1 +
 apps/activity/l10n/fi_FI.php                       |   1 +
 apps/activity/l10n/he.php                          |  43 ++++++-
 apps/activity/l10n/it.php                          |   1 +
 apps/activity/l10n/nb_NO.php                       |   1 +
 apps/activity/l10n/nl.php                          |   3 +-
 apps/activity/l10n/pl.php                          |   1 +
 apps/activity/l10n/pt_BR.php                       |   1 +
 apps/activity/l10n/sv.php                          |   1 +
 apps/bookmarks/appinfo/database.xml                |   9 --
 apps/calendar/lib/app.php                          |   8 +-
 apps/documents/lib/db/member.php                   |   2 +-
 apps/files_pdfviewer/README.md                     |   4 +
 apps/files_pdfviewer/templates/pdf.php             |  26 ++--
 console.php                                        |  18 ++-
 core/command/user/resetpassword.php                |  10 ++
 core/css/styles.css                                |   4 +
 core/doc/user/_sources/files/deletedfiles.txt      |   2 +-
 core/doc/user/_sources/files/filesweb.txt          |  16 +--
 core/doc/user/_sources/files/quota.txt             |   6 +-
 .../user/_sources/files/server_to_server_using.txt |   2 +-
 core/doc/user/_sources/webinterface.txt            |  20 +--
 core/doc/user/files/deletedfiles.html              |   2 +-
 core/doc/user/files/filesweb.html                  |  16 ++-
 core/doc/user/files/quota.html                     |   6 +-
 core/doc/user/files/server_to_server_using.html    |   2 +-
 core/doc/user/webinterface.html                    |  34 ++---
 core/js/apps.js                                    | 139 +++++++++++----------
 core/js/share.js                                   |   2 +-
 core/js/singleselect.js                            |  10 +-
 core/js/tests/specs/shareSpec.js                   |  26 ++--
 core/templates/untrustedDomain.php                 |  19 +++
 lib/base.php                                       |   7 +-
 lib/private/allconfig.php                          |   7 +-
 lib/private/files/objectstore/swift.php            |   9 +-
 lib/public/iconfig.php                             |   3 +-
 settings/ajax/setsecurity.php                      |  12 +-
 settings/js/admin.js                               |  18 +++
 settings/js/users/groups.js                        |  24 ----
 settings/js/users/users.js                         |  82 +++++++-----
 settings/templates/users/part.setquota.php         |   6 +-
 version.php                                        |   8 +-
 50 files changed, 395 insertions(+), 261 deletions(-)

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