[Pkg-owncloud-commits] [owncloud] 27/32: Merge tag 'upstream/6.0.0.a+dfsg'
David Prévot
taffit at moszumanska.debian.org
Sun Dec 15 01:47:34 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit b2a39e0050376ac52ec15c5b6e9ff85dc9f081ce
Merge: 268ff3e 4c9d9d4
Author: David Prévot <taffit at debian.org>
Date: Sat Dec 14 20:21:26 2013 -0400
Merge tag 'upstream/6.0.0.a+dfsg'
Upstream version 6.0.0.a+dfsg
# gpg: Signature faite le sam. 14 déc. 2013 20:20:35 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
.../Doctrine/DBAL/Platforms/AbstractPlatform.php | 2 +-
.../Doctrine/DBAL/Platforms/PostgreSqlPlatform.php | 4 +-
3rdparty/fullcalendar/GPL-LICENSE.txt | 278 -
3rdparty/fullcalendar/MIT-LICENSE.txt | 20 -
3rdparty/fullcalendar/css/fullcalendar.css | 579 ---
3rdparty/fullcalendar/css/fullcalendar.print.css | 32 -
3rdparty/fullcalendar/js/fullcalendar.js | 5378 --------------------
3rdparty/fullcalendar/js/fullcalendar.min.js | 7 -
3rdparty/fullcalendar/js/gcal.js | 107 -
3rdparty/openid/class.openid.v3.php | 326 --
3rdparty/openid/phpmyid.php | 1707 -------
3rdparty/smb4php/smb.php | 484 --
apps/activity/js/script.js | 2 +-
apps/contacts/js/app.js | 2 +-
apps/contacts/lib/contact.php | 10 +-
apps/contacts/lib/controller/importcontroller.php | 1 +
apps/documents/appinfo/database.xml | 17 -
apps/documents/templates/public.php | 2 +-
apps/files_encryption/appinfo/database.xml | 5 +-
apps/files_trashbin/js/trash.js | 8 +
apps/search_lucene/appinfo/preupdate.php | 36 +
apps/search_lucene/appinfo/update.php | 18 +-
apps/search_lucene/lib/indexer.php | 4 +-
apps/user_ldap/lib/configuration.php | 11 +-
apps/user_ldap/templates/part.wizard-server.php | 4 +-
.../admin/_images/ldap-advanced-1-connection.png | Bin 0 -> 24086 bytes
.../admin/_images/ldap-advanced-2-directory.png | Bin 0 -> 30870 bytes
.../admin/_images/ldap-advanced-3-attributes.png | Bin 0 -> 17336 bytes
...p-advanced-settings-connection-settings-oc5.png | Bin 28795 -> 0 bytes
...ap-advanced-settings-directory-settings-oc5.png | Bin 31710 -> 0 bytes
.../admin/_images/ldap-advanced-settings-oc5.png | Bin 28234 -> 0 bytes
...ap-advanced-settings-special-attributes-oc5.png | Bin 11241 -> 0 bytes
core/doc/admin/_images/ldap-basic-settings-oc5.png | Bin 25805 -> 0 bytes
.../doc/admin/_images/ldap-expert-settings-oc5.png | Bin 148150 -> 0 bytes
core/doc/admin/_images/ldap-expert.png | Bin 0 -> 101261 bytes
core/doc/admin/_images/ldap-fetched-avatar.png | Bin 0 -> 33049 bytes
core/doc/admin/_images/ldap-wizard-1-server.png | Bin 0 -> 21101 bytes
core/doc/admin/_images/ldap-wizard-2-user.png | Bin 0 -> 30654 bytes
core/doc/admin/_images/ldap-wizard-3-login.png | Bin 0 -> 27824 bytes
core/doc/admin/_images/ldap-wizard-4-group.png | Bin 0 -> 30865 bytes
.../doc/admin/_sources/configuration/auth_ldap.txt | 349 +-
.../configuration/configuration_3rdparty.txt | 4 +-
.../_sources/configuration/configuration_apps.txt | 10 +-
.../configuration/configuration_automation.txt | 17 +-
.../configuration/configuration_database.txt | 38 +-
.../configuration/configuration_encryption.txt | 2 +-
.../configuration/configuration_knowledgebase.txt | 9 +-
.../configuration/configuration_logging.txt | 2 +-
.../_sources/configuration/configuration_mail.txt | 7 +-
.../configuration/configuring_big_file_upload.txt | 13 +-
.../configuration/custom_mount_config_gui.txt | 4 +-
.../doc/admin/_sources/configuration/xsendfile.txt | 16 +-
core/doc/admin/_sources/index.txt | 46 +-
.../installation/installation_appliance.txt | 13 +-
.../_sources/installation/installation_linux.txt | 121 +-
.../_sources/installation/installation_macos.txt | 2 +-
.../_sources/installation/installation_others.txt | 172 +-
.../_sources/installation/installation_source.txt | 300 +-
.../_sources/installation/installation_ucs.txt | 4 +-
.../_sources/installation/installation_windows.txt | 20 +-
core/doc/admin/_sources/maintenance/backup.txt | 4 +-
core/doc/admin/_sources/maintenance/restore.txt | 4 +-
core/doc/admin/_sources/maintenance/update.txt | 16 +-
core/doc/admin/configuration/auth_ldap.html | 361 +-
.../configuration/configuration_3rdparty.html | 4 +-
.../admin/configuration/configuration_apps.html | 8 +-
.../configuration/configuration_automation.html | 17 +-
.../configuration/configuration_database.html | 37 +-
.../configuration/configuration_encryption.html | 2 +-
.../configuration/configuration_knowledgebase.html | 7 +-
.../admin/configuration/configuration_logging.html | 2 +-
.../admin/configuration/configuration_mail.html | 7 +-
.../configuration/configuring_big_file_upload.html | 13 +-
.../configuration/custom_mount_config_gui.html | 4 +-
core/doc/admin/configuration/index.html | 2 +-
core/doc/admin/configuration/xsendfile.html | 16 +-
core/doc/admin/contents.html | 29 +-
core/doc/admin/index.html | 51 +-
core/doc/admin/installation/index.html | 6 +-
.../admin/installation/installation_appliance.html | 10 +-
.../doc/admin/installation/installation_linux.html | 129 +-
.../doc/admin/installation/installation_macos.html | 5 +-
.../admin/installation/installation_others.html | 179 +-
.../admin/installation/installation_source.html | 291 +-
core/doc/admin/installation/installation_ucs.html | 7 +-
.../admin/installation/installation_windows.html | 24 +-
core/doc/admin/maintenance/backup.html | 3 +-
core/doc/admin/maintenance/restore.html | 3 +-
core/doc/admin/maintenance/update.html | 16 +-
core/js/js.js | 9 +-
core/skeleton/ownCloudUserManual.pdf | Bin 1393293 -> 1393287 bytes
lib/base.php | 94 +-
lib/private/db.php | 3 +
lib/private/db/mdb2schemareader.php | 5 +-
lib/private/user/session.php | 34 +
lib/public/backgroundjob.php | 8 +-
lib/public/share.php | 5 +-
version.php | 6 +-
98 files changed, 1466 insertions(+), 10148 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