[Pkg-owncloud-commits] [owncloud] 03/07: Merge tag 'upstream/5.0.13_rc1+dfsg' into 5.0

David Prévot taffit at alioth.debian.org
Fri Nov 1 15:30:45 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 ff62ae77839a6fe793e0c74dcb4d985872fd9d17
Merge: 2361f71 f63bc75
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 31 22:48:54 2013 -0400

    Merge tag 'upstream/5.0.13_rc1+dfsg' into 5.0
    
    Upstream version 5.0.13~rc1+dfsg
    
    # gpg: Signature faite le jeu. 31 oct. 2013 22:48: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

 3rdparty/Sabre/CalDAV/Plugin.php                   |   12 +-
 3rdparty/Sabre/CardDAV/Plugin.php                  |    2 +-
 3rdparty/Sabre/DAVACL/Plugin.php                   |    4 +-
 3rdparty/Sabre/VObject/Parameter.php               |    6 +-
 3rdparty/smb4php/smb.php                           |   10 +-
 apps/bookmarks/ajax/editBookmark.php               |    6 +
 apps/bookmarks/js/bookmarks.js                     |    3 +-
 apps/bookmarks/lib/bookmarks.php                   |   11 +-
 apps/bookmarks/templates/list.php                  |    4 +-
 apps/contacts/lib/app.php                          |   13 +-
 apps/contacts/lib/vcard.php                        |    4 +-
 apps/files/ajax/upload.php                         |    7 +-
 apps/files/js/file-upload.js                       |    2 +
 apps/files/js/fileactions.js                       |   12 +-
 apps/files/js/filelist.js                          |    4 +-
 apps/files/js/files.js                             |    2 +-
 apps/files_encryption/hooks/hooks.php              |   70 +-
 apps/files_encryption/lib/keymanager.php           |    7 +-
 apps/files_encryption/lib/proxy.php                |   56 +-
 apps/files_encryption/lib/stream.php               |    3 +-
 apps/files_encryption/lib/util.php                 |   11 +-
 apps/files_encryption/settings-admin.php           |    4 +-
 apps/files_encryption/tests/util.php               |   28 +
 apps/files_external/lib/streamwrapper.php          |   36 +-
 apps/files_pdfviewer/3rdparty/pdfjs/viewer.js      |    2 +-
 apps/files_sharing/appinfo/app.php                 |    1 +
 apps/files_sharing/appinfo/routes.php              |   27 +
 apps/files_sharing/appinfo/update.php              |   22 +-
 apps/files_sharing/appinfo/version                 |    2 +-
 apps/files_sharing/js/share.js                     |   18 +-
 apps/files_sharing/lib/api.php                     |  531 +++++++++++++
 apps/files_sharing/lib/cache.php                   |   97 ++-
 apps/files_sharing/lib/updater.php                 |   30 +-
 apps/files_sharing/templates/public.php            |    1 +
 apps/files_sharing/tests/api.php                   |  597 +++++++++++++++
 apps/files_texteditor/css/style.css                |    5 +
 apps/files_texteditor/js/editor.js                 |    4 +
 apps/files_versions/js/versions.js                 |    8 +
 apps/firstrunwizard/appinfo/app.php                |    2 +-
 apps/gallery/lib/thumbnail.php                     |    2 +-
 apps/search_lucene/appinfo/app.php                 |   18 +-
 apps/updater/ajax/update.php                       |    2 +-
 apps/updater/js/controllers.js                     |   14 +-
 apps/user_ldap/lib/access.php                      |   21 +-
 config/config.sample.php                           |    5 +-
 core/ajax/share.php                                |    2 +-
 .../configuration/configuration_automation.txt     |   48 +-
 .../configuration/configuration_database.txt       |    2 +-
 .../_sources/installation/installation_others.txt  |    4 +-
 core/doc/admin/_static/ajax-loader.gif             |  Bin 0 -> 673 bytes
 core/doc/admin/_static/basic.css                   |   18 +-
 core/doc/admin/_static/comment-bright.png          |  Bin 0 -> 3500 bytes
 core/doc/admin/_static/comment-close.png           |  Bin 0 -> 3578 bytes
 core/doc/admin/_static/comment.png                 |  Bin 0 -> 3445 bytes
 core/doc/admin/_static/doctools.js                 |   10 +-
 core/doc/admin/_static/down-pressed.png            |  Bin 0 -> 368 bytes
 core/doc/admin/_static/down.png                    |  Bin 0 -> 363 bytes
 core/doc/admin/_static/searchtools.js              |  140 ++--
 core/doc/admin/_static/up-pressed.png              |  Bin 0 -> 372 bytes
 core/doc/admin/_static/up.png                      |  Bin 0 -> 363 bytes
 core/doc/admin/_static/websupport.js               |  808 ++++++++++++++++++++
 core/doc/admin/configuration/auth_ldap.html        |    7 +-
 core/doc/admin/configuration/background_jobs.html  |    7 +-
 .../configuration/configuration_3rdparty.html      |    7 +-
 .../admin/configuration/configuration_apps.html    |   11 +-
 .../configuration/configuration_automation.html    |   53 +-
 .../configuration_custom_clients.html              |    7 +-
 .../configuration/configuration_database.html      |    9 +-
 .../configuration/configuration_encryption.html    |    7 +-
 .../configuration/configuration_knowledgebase.html |    7 +-
 .../configuration/configuration_language.html      |    7 +-
 .../admin/configuration/configuration_logging.html |    7 +-
 .../admin/configuration/configuration_mail.html    |   25 +-
 .../configuration/configuration_maintenance.html   |    7 +-
 .../configuration/configuration_reverseproxy.html  |    7 +-
 .../configuration/configuring_big_file_upload.html |    7 +-
 .../admin/configuration/custom_mount_config.html   |  156 ++--
 .../configuration/custom_mount_config_gui.html     |    7 +-
 .../admin/configuration/custom_user_backend.html   |   23 +-
 core/doc/admin/configuration/index.html            |    7 +-
 core/doc/admin/configuration/xsendfile.html        |    7 +-
 core/doc/admin/contents.html                       |    8 +-
 core/doc/admin/genindex.html                       |   17 +-
 core/doc/admin/index.html                          |    7 +-
 core/doc/admin/installation/index.html             |    7 +-
 .../admin/installation/installation_appliance.html |    9 +-
 .../doc/admin/installation/installation_linux.html |    7 +-
 .../doc/admin/installation/installation_macos.html |    7 +-
 .../admin/installation/installation_others.html    |   11 +-
 .../admin/installation/installation_source.html    |    9 +-
 core/doc/admin/installation/installation_ucs.html  |   61 +-
 .../admin/installation/installation_windows.html   |   11 +-
 core/doc/admin/issues/index.html                   |    7 +-
 core/doc/admin/maintenance/backup.html             |   13 +-
 core/doc/admin/maintenance/index.html              |    7 +-
 core/doc/admin/maintenance/migrating.html          |    7 +-
 core/doc/admin/maintenance/update.html             |    7 +-
 core/doc/admin/search.html                         |    7 +-
 core/doc/admin/searchindex.js                      |    2 +-
 core/doc/user/_sources/files/files.txt             |   32 +-
 core/doc/user/_static/ajax-loader.gif              |  Bin 0 -> 673 bytes
 core/doc/user/_static/basic.css                    |   18 +-
 core/doc/user/_static/comment-bright.png           |  Bin 0 -> 3500 bytes
 core/doc/user/_static/comment-close.png            |  Bin 0 -> 3578 bytes
 core/doc/user/_static/comment.png                  |  Bin 0 -> 3445 bytes
 core/doc/user/_static/doctools.js                  |   10 +-
 core/doc/user/_static/down-pressed.png             |  Bin 0 -> 368 bytes
 core/doc/user/_static/down.png                     |  Bin 0 -> 363 bytes
 core/doc/user/_static/searchtools.js               |  140 ++--
 core/doc/user/_static/up-pressed.png               |  Bin 0 -> 372 bytes
 core/doc/user/_static/up.png                       |  Bin 0 -> 363 bytes
 core/doc/user/_static/websupport.js                |  808 ++++++++++++++++++++
 core/doc/user/bookmarks.html                       |    7 +-
 core/doc/user/contents.html                        |    7 +-
 .../user/files/configuring_big_file_upload.html    |    7 +-
 core/doc/user/files/deletedfiles.html              |    7 +-
 core/doc/user/files/encryption.html                |    7 +-
 core/doc/user/files/files.html                     |   41 +-
 core/doc/user/files/index.html                     |    7 +-
 core/doc/user/files/sync.html                      |    7 +-
 core/doc/user/files/versioncontrol.html            |    7 +-
 core/doc/user/genindex.html                        |   17 +-
 core/doc/user/index.html                           |    7 +-
 core/doc/user/mediaplayer.html                     |    7 +-
 core/doc/user/migration.html                       |    7 +-
 core/doc/user/pim/calendar.html                    |    7 +-
 core/doc/user/pim/contacts.html                    |    7 +-
 core/doc/user/pim/index.html                       |    7 +-
 core/doc/user/pim/sync_ios.html                    |    7 +-
 core/doc/user/pim/sync_kde.html                    |    7 +-
 core/doc/user/pim/sync_osx.html                    |    7 +-
 core/doc/user/pim/sync_thunderbird.html            |    9 +-
 core/doc/user/pim/troubleshooting.html             |    7 +-
 core/doc/user/search.html                          |    7 +-
 core/doc/user/searchindex.js                       |    2 +-
 core/doc/user/webinterface.html                    |    7 +-
 core/js/multiselect.js                             |    6 +-
 core/js/share.js                                   |  107 ++-
 lib/base.php                                       |    1 +
 lib/cache/file.php                                 |   18 +
 lib/connector/sabre/directory.php                  |   61 +-
 lib/connector/sabre/file.php                       |   16 +-
 lib/connector/sabre/node.php                       |   11 +
 lib/db.php                                         |   93 ++-
 lib/filechunking.php                               |   33 +-
 lib/files/cache/cache.php                          |  232 ++++--
 lib/files/cache/updater.php                        |   50 +-
 lib/files/filesystem.php                           |    6 +-
 lib/files/storage/home.php                         |   31 +
 lib/files/view.php                                 |    9 +-
 lib/helper.php                                     |   24 +-
 lib/log.php                                        |    2 +
 lib/log/owncloud.php                               |   24 +-
 lib/public/share.php                               |   27 +-
 lib/setup.php                                      |    8 +-
 lib/updater.php                                    |    3 +-
 lib/user.php                                       |   10 +-
 lib/user/database.php                              |    2 +-
 lib/util.php                                       |    6 +-
 159 files changed, 4573 insertions(+), 761 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