[Pkg-owncloud-commits] [owncloud] 63/83: Merge tag 'upstream/5.0.14_rc1+dfsg' into 5.0
David Prévot
taffit at moszumanska.debian.org
Wed Dec 18 13:05:32 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch 5.0
in repository owncloud.
commit 62bc6f9c9f30439f575443e9c1d7ef34830d00e2
Merge: 71517e5 68fb82f
Author: David Prévot <taffit at debian.org>
Date: Fri Dec 13 21:13:34 2013 -0400
Merge tag 'upstream/5.0.14_rc1+dfsg' into 5.0
Upstream version 5.0.14~rc1+dfsg
# gpg: Signature faite le ven. 13 déc. 2013 21:10:02 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
3rdparty/smb4php/smb.php | 21 +-
apps/calendar/lib/sabre/backend.php | 2 +-
apps/calendar/lib/share/event.php | 11 +-
apps/contacts/appinfo/bootstrap.php | 3 +-
apps/contacts/lib/sabre/validatorplugin.php | 1 +
apps/files/ajax/getstoragestats.php | 8 +-
apps/files/ajax/list.php | 1 +
apps/files/appinfo/remote.php | 3 +-
apps/files/css/files.css | 3 +
apps/files/index.php | 3 +-
apps/files/js/filelist.js | 31 +
apps/files/js/files.js | 8 +-
apps/files/templates/index.php | 19 +-
apps/files_encryption/lib/util.php | 47 +-
apps/files_external/lib/ftp.php | 19 +
apps/files_external/lib/smb.php | 25 +-
apps/files_external/lib/streamwrapper.php | 22 +-
apps/files_external/tests/ftp.php | 12 +
apps/files_external/tests/smbfunctions.php | 41 +
apps/files_imageviewer/appinfo/app.php | 6 -
apps/files_imageviewer/appinfo/info.xml | 11 -
apps/files_imageviewer/appinfo/version | 1 -
.../css/jquery.fancybox-1.3.4.css | 359 ------
apps/files_imageviewer/img/blank.gif | Bin 43 -> 0 bytes
apps/files_imageviewer/img/fancy_close.png | Bin 1517 -> 0 bytes
apps/files_imageviewer/img/fancy_loading.png | Bin 10195 -> 0 bytes
apps/files_imageviewer/img/fancy_nav_left.png | Bin 1446 -> 0 bytes
apps/files_imageviewer/img/fancy_nav_right.png | Bin 1454 -> 0 bytes
apps/files_imageviewer/img/fancy_shadow_e.png | Bin 107 -> 0 bytes
apps/files_imageviewer/img/fancy_shadow_n.png | Bin 106 -> 0 bytes
apps/files_imageviewer/img/fancy_shadow_ne.png | Bin 347 -> 0 bytes
apps/files_imageviewer/img/fancy_shadow_nw.png | Bin 324 -> 0 bytes
apps/files_imageviewer/img/fancy_shadow_s.png | Bin 111 -> 0 bytes
apps/files_imageviewer/img/fancy_shadow_se.png | Bin 352 -> 0 bytes
apps/files_imageviewer/img/fancy_shadow_sw.png | Bin 340 -> 0 bytes
apps/files_imageviewer/img/fancy_shadow_w.png | Bin 103 -> 0 bytes
apps/files_imageviewer/img/fancy_title_left.png | Bin 503 -> 0 bytes
apps/files_imageviewer/img/fancy_title_main.png | Bin 96 -> 0 bytes
apps/files_imageviewer/img/fancy_title_over.png | Bin 70 -> 0 bytes
apps/files_imageviewer/img/fancy_title_right.png | Bin 506 -> 0 bytes
apps/files_imageviewer/img/fancybox-x.png | Bin 203 -> 0 bytes
apps/files_imageviewer/img/fancybox-y.png | Bin 166 -> 0 bytes
apps/files_imageviewer/img/fancybox.png | Bin 15287 -> 0 bytes
apps/files_imageviewer/js/jquery.fancybox-1.3.4.js | 1156 --------------------
.../js/jquery.fancybox-1.3.4.pack.js | 1 -
.../js/jquery.mousewheel-3.0.4.js | 78 --
.../js/jquery.mousewheel-3.0.4.pack.js | 14 -
apps/files_imageviewer/js/lightbox.js | 32 -
apps/files_pdfviewer/js/loader.js | 3 +-
apps/gallery/lib/thumbnail.php | 6 +-
apps/media/lib/ampache.php | 43 +-
apps/media/lib/track.php | 10 +-
apps/media/templates/ampache/albums.php | 2 +-
apps/media/templates/ampache/handshake.php | 2 +-
apps/search_lucene/ajax/lucene.php | 4 +-
apps/search_lucene/appinfo/database.xml | 7 +
apps/search_lucene/appinfo/version | 2 +-
apps/search_lucene/lib/indexer.php | 52 +-
apps/search_lucene/lib/lucene.php | 95 +-
apps/updater/js/controllers.js | 2 +-
.../doc/admin/_sources/configuration/auth_ldap.txt | 1 +
core/doc/admin/configuration/auth_ldap.html | 1 +
core/doc/admin/searchindex.js | 2 +-
core/js/js.js | 22 +
db_structure.xml | 2 +-
lib/db.php | 26 +-
lib/fileproxy/quota.php | 7 +-
lib/files.php | 4 +-
lib/files/cache/cache.php | 4 +-
lib/files/cache/scanner.php | 48 +-
lib/files/filesystem.php | 26 +-
lib/files/storage/home.php | 12 +-
lib/files/storage/local.php | 22 +-
lib/files/storage/mappedlocal.php | 26 +-
lib/files/view.php | 12 +-
lib/helper.php | 3 +-
lib/request.php | 36 +-
lib/search/provider/file.php | 3 +-
lib/search/result.php | 3 +-
lib/user.php | 2 +
lib/util.php | 4 +-
search/js/result.js | 55 +-
82 files changed, 632 insertions(+), 1855 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