[Pkg-owncloud-commits] [owncloud] 44/49: Merge tag 'upstream/6.0.0_rc3+dfsg'
David Prévot
taffit at moszumanska.debian.org
Thu Dec 5 16:02:57 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 3b16d04260aee3690600ed49f5dc2097d114c7a9
Merge: 9269b6b 9da0817
Author: David Prévot <taffit at debian.org>
Date: Thu Dec 5 09:44:34 2013 -0400
Merge tag 'upstream/6.0.0_rc3+dfsg'
Upstream version 6.0.0~rc3+dfsg
# gpg: Signature faite le jeu. 05 déc. 2013 09:43:10 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/bookmarks/l10n/ar/bookmarks.po | 4 +-
apps/bookmarks/l10n/bg_BG/bookmarks.po | 4 +-
apps/bookmarks/l10n/bn_BD/bookmarks.po | 4 +-
apps/bookmarks/l10n/ca.php | 1 +
apps/bookmarks/l10n/ca/bookmarks.po | 9 +-
apps/bookmarks/l10n/cs_CZ/bookmarks.po | 4 +-
apps/bookmarks/l10n/cy_GB/bookmarks.po | 4 +-
apps/bookmarks/l10n/da/bookmarks.po | 4 +-
apps/bookmarks/l10n/de/bookmarks.po | 6 +-
apps/bookmarks/l10n/de_CH/bookmarks.po | 6 +-
apps/bookmarks/l10n/de_DE/bookmarks.po | 8 +-
apps/bookmarks/l10n/el/bookmarks.po | 4 +-
apps/bookmarks/l10n/en_GB/bookmarks.po | 4 +-
apps/bookmarks/l10n/eo/bookmarks.po | 4 +-
apps/bookmarks/l10n/es/bookmarks.po | 4 +-
apps/bookmarks/l10n/es_AR/bookmarks.po | 4 +-
apps/bookmarks/l10n/et_EE/bookmarks.po | 4 +-
apps/bookmarks/l10n/eu/bookmarks.po | 4 +-
apps/bookmarks/l10n/fa/bookmarks.po | 4 +-
apps/bookmarks/l10n/fi_FI/bookmarks.po | 4 +-
apps/bookmarks/l10n/fr/bookmarks.po | 4 +-
apps/bookmarks/l10n/gl/bookmarks.po | 4 +-
apps/bookmarks/l10n/he/bookmarks.po | 4 +-
apps/bookmarks/l10n/hr/bookmarks.po | 4 +-
apps/bookmarks/l10n/hu_HU/bookmarks.po | 4 +-
apps/bookmarks/l10n/ia/bookmarks.po | 4 +-
apps/bookmarks/l10n/id/bookmarks.po | 4 +-
apps/bookmarks/l10n/is/bookmarks.po | 4 +-
apps/bookmarks/l10n/it/bookmarks.po | 4 +-
apps/bookmarks/l10n/ja_JP/bookmarks.po | 4 +-
apps/bookmarks/l10n/ka_GE/bookmarks.po | 4 +-
apps/bookmarks/l10n/ko/bookmarks.po | 4 +-
apps/bookmarks/l10n/ku_IQ/bookmarks.po | 4 +-
apps/bookmarks/l10n/lb/bookmarks.po | 4 +-
apps/bookmarks/l10n/lt_LT/bookmarks.po | 4 +-
apps/bookmarks/l10n/lv/bookmarks.po | 4 +-
apps/bookmarks/l10n/mk/bookmarks.po | 4 +-
apps/bookmarks/l10n/ms_MY/bookmarks.po | 4 +-
apps/bookmarks/l10n/nb_NO/bookmarks.po | 4 +-
apps/bookmarks/l10n/nl.php | 1 +
apps/bookmarks/l10n/nl/bookmarks.po | 8 +-
apps/bookmarks/l10n/nn_NO/bookmarks.po | 4 +-
apps/bookmarks/l10n/oc/bookmarks.po | 4 +-
apps/bookmarks/l10n/pl/bookmarks.po | 4 +-
apps/bookmarks/l10n/pt_BR/bookmarks.po | 4 +-
apps/bookmarks/l10n/pt_PT.php | 1 +
apps/bookmarks/l10n/pt_PT/bookmarks.po | 9 +-
apps/bookmarks/l10n/ro/bookmarks.po | 4 +-
apps/bookmarks/l10n/ru.php | 1 +
apps/bookmarks/l10n/ru/bookmarks.po | 9 +-
apps/bookmarks/l10n/ru_RU.php | 1 +
apps/bookmarks/l10n/ru_RU/bookmarks.po | 6 +-
apps/bookmarks/l10n/si_LK/bookmarks.po | 4 +-
apps/bookmarks/l10n/sk_SK.php | 1 +
apps/bookmarks/l10n/sk_SK/bookmarks.po | 8 +-
apps/bookmarks/l10n/sl/bookmarks.po | 4 +-
apps/bookmarks/l10n/sq/bookmarks.po | 4 +-
apps/bookmarks/l10n/sr/bookmarks.po | 4 +-
apps/bookmarks/l10n/sr at latin/bookmarks.po | 4 +-
apps/bookmarks/l10n/sv/bookmarks.po | 4 +-
apps/bookmarks/l10n/ta_LK/bookmarks.po | 4 +-
apps/bookmarks/l10n/templates/bookmarks.pot | 2 +-
apps/bookmarks/l10n/th_TH/bookmarks.po | 4 +-
apps/bookmarks/l10n/tr/bookmarks.po | 6 +-
apps/bookmarks/l10n/ug/bookmarks.po | 4 +-
apps/bookmarks/l10n/uk/bookmarks.po | 4 +-
apps/bookmarks/l10n/vi/bookmarks.po | 4 +-
apps/bookmarks/l10n/zh_CN/bookmarks.po | 4 +-
apps/bookmarks/l10n/zh_HK/bookmarks.po | 4 +-
apps/bookmarks/l10n/zh_TW/bookmarks.po | 4 +-
apps/documents/ajax/sessionController.php | 20 +-
apps/documents/css/style.css | 7 -
apps/documents/css/viewer/odfviewer.css | 15 +-
apps/documents/js/3rdparty/webodf/editor/Editor.js | 90 +-
.../js/3rdparty/webodf/editor/EditorSession.js | 52 +-
.../3rdparty/webodf/editor/server/ServerFactory.js | 3 +-
.../webodf/editor/server/owncloud/ServerFactory.js | 4 +-
.../editor/server/pullbox/OperationRouter.js | 188 +-
.../webodf/editor/server/pullbox/Server.js | 43 +-
.../webodf/editor/server/pullbox/ServerFactory.js | 4 +-
.../webodf/editor/server/pullbox/SessionList.js | 2 +
.../webodf/editor/widgets/paragraphStyles.js | 2 +-
apps/documents/js/3rdparty/webodf/webodf-debug.js | 27831 ++++++++++---------
apps/documents/js/3rdparty/webodf/webodf.js | 1849 +-
apps/documents/js/documents.js | 21 +-
apps/documents/js/viewer/viewer.js | 49 +-
apps/documents/lib/file.php | 30 +
apps/documents/lib/genesis.php | 19 +-
apps/files_encryption/lib/helper.php | 9 +-
apps/files_external/lib/amazons3.php | 12 +-
apps/files_external/lib/config.php | 7 +-
apps/files_external/templates/settings.php | 2 +-
apps/files_sharing/css/public.css | 29 +-
apps/files_trashbin/ajax/delete.php | 32 +-
apps/files_trashbin/ajax/undelete.php | 1 +
apps/files_trashbin/css/trash.css | 3 +
apps/files_trashbin/index.php | 1 +
apps/files_trashbin/js/trash.js | 50 +-
apps/files_trashbin/lib/helper.php | 2 +
apps/files_trashbin/lib/trashbin.php | 22 +-
apps/files_trashbin/templates/part.list.php | 13 +-
apps/search_lucene/ajax/lucene.php | 19 +-
apps/search_lucene/appinfo/update.php | 17 +
apps/search_lucene/appinfo/version | 2 +-
apps/search_lucene/lib/status.php | 85 +
apps/user_ldap/ajax/setConfiguration.php | 12 +
apps/user_ldap/ajax/testConfiguration.php | 2 +
apps/user_ldap/js/settings.js | 72 +-
apps/user_ldap/lib/configuration.php | 2 +-
apps/user_ldap/lib/wizard.php | 3 +-
config/config.sample.php | 7 +-
core/css/styles.css | 13 +-
core/skeleton/ownCloudUserManual.pdf | Bin 1393380 -> 1393379 bytes
lib/private/files/storage/wrapper/wrapper.php | 8 +
lib/private/files/view.php | 8 +-
lib/private/setup/abstractdatabase.php | 4 +
lib/private/setup/oci.php | 63 +-
lib/private/util.php | 12 +-
settings/admin.php | 1 +
settings/templates/admin.php | 14 +
version.php | 6 +-
121 files changed, 15897 insertions(+), 15160 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