[Pkg-owncloud-commits] [owncloud] 14/16: Merge tag 'upstream/7.0.3_rc2+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 ff3e5e27a640032eea680bc450c664c42875e2e2
Merge: 1fb4d6a e33ed7e
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 30 14:21:50 2014 -0400

    Merge tag 'upstream/7.0.3_rc2+dfsg'
    
    Upstream version 7.0.3~rc2+dfsg
    
    # gpg: Signature faite le jeu. 30 oct. 2014 14:19:26 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/files_encryption/hooks/hooks.php              |  58 ++++----
 apps/files_encryption/tests/share.php              |  17 ++-
 apps/files_sharing/lib/sharedstorage.php           |   2 +-
 apps/gallery/js/slideshow.js                       |  62 +++++---
 config/config.sample.php                           |  17 +++
 core/avatar/controller.php                         |   1 +
 .../_sources/configuration/background_jobs.txt     |   2 +-
 .../_sources/installation/installation_source.txt  |  33 +++--
 core/doc/admin/configuration/background_jobs.html  |   2 +-
 core/doc/admin/contents.html                       |   2 +-
 .../admin/installation/installation_source.html    |  35 +++--
 core/doc/user/_sources/files/quota.txt             |   3 +-
 core/doc/user/_sources/installing_apps.txt         |  19 +++
 core/doc/user/files/quota.html                     |   3 +-
 core/doc/user/installing_apps.html                 | 156 +++++++++++++++++++++
 core/setup/controller.php                          |  49 +++----
 lib/base.php                                       |   6 +-
 lib/private/connector/sabre/directory.php          |  18 ++-
 lib/private/db/adaptermysql.php                    |  17 +++
 lib/private/db/adapteroci8.php                     |  12 +-
 lib/private/db/adaptersqlite.php                   |   1 +
 lib/private/db/adaptersqlsrv.php                   |   1 +
 lib/private/db/connectionfactory.php               |   5 +-
 lib/private/db/sqlitesessioninit.php               |  42 ++++++
 lib/private/files/cache/cache.php                  |  14 +-
 lib/private/setup.php                              | 103 +++++++++++++-
 lib/private/util.php                               |   8 +-
 search/ajax/search.php                             |   1 +
 version.php                                        |   8 +-
 29 files changed, 547 insertions(+), 150 deletions(-)

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