[Pkg-owncloud-commits] [owncloud] 03/09: Merge tag 'upstream/5.0.11+dfsg'
David Prévot
taffit at alioth.debian.org
Tue Sep 10 21:54: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 7b29b355893e81790e71a2d7fe8b15a6aa59aeff
Merge: 1a56ebf 0508bac
Author: David Prévot <taffit at debian.org>
Date: Fri Sep 6 16:58:17 2013 -0400
Merge tag 'upstream/5.0.11+dfsg'
Upstream version 5.0.11+dfsg
# gpg: Signature faite le ven. 06 sept. 2013 16:57:12 AST avec la clef RSA d'identifiant 44F6BD3C
# 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/contacts/lib/sabre/backend.php | 5 +-
apps/contacts/templates/contacts.php | 13 +-
apps/files_encryption/lib/keymanager.php | 28 +-
apps/files_encryption/lib/stream.php | 28 +-
apps/files_encryption/lib/util.php | 44 +-
apps/files_texteditor/appinfo/app.php | 2 +-
apps/files_texteditor/js/aceeditor/LICENSE | 476 -------
apps/files_texteditor/js/aceeditor/ext-emmet.js | 270 ----
.../js/aceeditor/mode-tm_snippet.js | 84 --
apps/files_texteditor/js/editor.js | 6 +-
.../ace/src-noconflict}/ace.js | 1221 ++++++++++++-----
.../src-noconflict}/ext-elastic_tabstops_lite.js | 2 +-
.../js/vendor/ace/src-noconflict/ext-emmet.js | 1056 +++++++++++++++
.../ace/src-noconflict}/ext-keybinding_menu.js | 6 +-
.../ace/src-noconflict/ext-language_tools.js | 1429 ++++++++++++++++++++
.../ace/src-noconflict}/ext-modelist.js | 7 +-
.../ace/src-noconflict}/ext-options.js | 2 +-
.../ace/src-noconflict}/ext-searchbox.js | 59 +-
.../ace/src-noconflict}/ext-settings_menu.js | 23 +-
.../ace/src-noconflict}/ext-spellcheck.js | 2 +-
.../js/vendor/ace/src-noconflict/ext-split.js | 271 ++++
.../ace/src-noconflict}/ext-static_highlight.js | 29 +-
.../ace/src-noconflict}/ext-statusbar.js | 2 +-
.../ace/src-noconflict}/ext-textarea.js | 32 +-
.../ace/src-noconflict}/ext-themelist.js | 4 +-
.../ace/src-noconflict}/ext-whitespace.js | 2 +-
.../ace/src-noconflict}/keybinding-emacs.js | 10 +-
.../ace/src-noconflict}/keybinding-vim.js | 61 +-
.../ace/src-noconflict}/mode-abap.js | 10 +-
.../ace/src-noconflict}/mode-actionscript.js | 6 +-
.../ace/src-noconflict}/mode-ada.js | 4 +-
.../ace/src-noconflict}/mode-asciidoc.js | 6 +-
.../ace/src-noconflict}/mode-assembly_x86.js | 6 +-
.../ace/src-noconflict}/mode-autohotkey.js | 6 +-
.../ace/src-noconflict}/mode-batchfile.js | 6 +-
.../ace/src-noconflict}/mode-c9search.js | 8 +-
.../ace/src-noconflict}/mode-c_cpp.js | 18 +-
.../ace/src-noconflict}/mode-clojure.js | 10 +-
.../ace/src-noconflict}/mode-cobol.js | 4 +-
.../ace/src-noconflict}/mode-coffee.js | 12 +-
.../ace/src-noconflict}/mode-coldfusion.js | 606 +++++----
.../ace/src-noconflict}/mode-csharp.js | 16 +-
.../ace/src-noconflict}/mode-css.js | 189 ++-
.../ace/src-noconflict/mode-curly.js} | 646 ++++++---
.../ace/src-noconflict}/mode-d.js | 6 +-
.../ace/src-noconflict}/mode-dart.js | 23 +-
.../ace/src-noconflict}/mode-diff.js | 9 +-
.../ace/src-noconflict}/mode-django.js | 580 +++++---
.../ace/src-noconflict}/mode-dot.js | 10 +-
.../ace/src-noconflict}/mode-ejs.js | 601 +++++---
.../ace/src-noconflict}/mode-erlang.js | 6 +-
.../ace/src-noconflict}/mode-forth.js | 6 +-
.../ace/src-noconflict}/mode-ftl.js | 571 +++++---
.../ace/src-noconflict}/mode-glsl.js | 27 +-
.../ace/src-noconflict}/mode-golang.js | 61 +-
.../ace/src-noconflict}/mode-groovy.js | 42 +-
.../ace/src-noconflict}/mode-haml.js | 8 +-
.../ace/src-noconflict}/mode-haskell.js | 6 +-
.../ace/src-noconflict}/mode-haxe.js | 17 +-
.../ace/src-noconflict/mode-html.js} | 653 +++++----
.../ace/src-noconflict}/mode-html_ruby.js | 642 +++++----
.../ace/src-noconflict}/mode-ini.js | 6 +-
.../ace/src-noconflict}/mode-jade.js | 648 +++++----
.../ace/src-noconflict}/mode-java.js | 42 +-
.../ace/src-noconflict}/mode-javascript.js | 34 +-
.../ace/src-noconflict}/mode-json.js | 10 +-
.../ace/src-noconflict}/mode-jsoniq.js | 38 +-
.../ace/src-noconflict}/mode-jsp.js | 583 +++++---
.../ace/src-noconflict}/mode-jsx.js | 12 +-
.../ace/src-noconflict}/mode-julia.js | 6 +-
.../ace/src-noconflict}/mode-latex.js | 6 +-
.../ace/src-noconflict}/mode-less.js | 12 +-
.../ace/src-noconflict}/mode-liquid.js | 572 +++++---
.../ace/src-noconflict}/mode-lisp.js | 5 +-
.../ace/src-noconflict}/mode-livescript.js | 4 +-
.../ace/src-noconflict}/mode-logiql.js | 10 +-
.../ace/src-noconflict}/mode-lsl.js | 277 ++--
.../ace/src-noconflict}/mode-lua.js | 17 +-
.../ace/src-noconflict}/mode-luapage.js | 634 +++++----
.../ace/src-noconflict}/mode-lucene.js | 4 +-
.../ace/src-noconflict}/mode-makefile.js | 39 +-
.../ace/src-noconflict}/mode-markdown.js | 724 +++++-----
.../ace/src-noconflict}/mode-matlab.js | 4 +-
.../ace/src-noconflict}/mode-mushcode.js | 6 +-
.../src-noconflict}/mode-mushcode_high_rules.js | 2 +-
.../ace/src-noconflict}/mode-mysql.js | 6 +-
.../ace/src-noconflict}/mode-objectivec.js | 10 +-
.../ace/src-noconflict}/mode-ocaml.js | 11 +-
.../ace/src-noconflict}/mode-pascal.js | 6 +-
.../ace/src-noconflict}/mode-perl.js | 21 +-
.../ace/src-noconflict}/mode-pgsql.js | 25 +-
.../ace/src-noconflict}/mode-php.js | 542 +++++---
.../ace/src-noconflict/mode-plain_text.js} | 75 +-
.../ace/src-noconflict}/mode-powershell.js | 15 +-
.../ace/src-noconflict}/mode-prolog.js | 6 +-
.../ace/src-noconflict}/mode-properties.js | 4 +-
.../ace/src-noconflict}/mode-python.js | 10 +-
.../ace/src-noconflict}/mode-r.js | 8 +-
.../ace/src-noconflict}/mode-rdoc.js | 8 +-
.../ace/src-noconflict}/mode-rhtml.js | 596 +++++---
.../ace/src-noconflict}/mode-ruby.js | 13 +-
.../ace/src-noconflict}/mode-rust.js | 6 +-
.../ace/src-noconflict}/mode-sass.js | 8 +-
.../ace/src-noconflict}/mode-scad.js | 17 +-
.../ace/src-noconflict}/mode-scala.js | 42 +-
.../ace/src-noconflict}/mode-scheme.js | 4 +-
.../ace/src-noconflict}/mode-scss.js | 12 +-
.../ace/src-noconflict}/mode-sh.js | 35 +-
.../ace/src-noconflict}/mode-snippets.js | 8 +-
.../ace/src-noconflict}/mode-sql.js | 9 +-
.../ace/src-noconflict}/mode-stylus.js | 182 +--
.../ace/src-noconflict}/mode-svg.js | 280 +++-
.../ace/src-noconflict}/mode-tcl.js | 8 +-
.../ace/src-noconflict}/mode-tex.js | 6 +-
.../ace/src-noconflict}/mode-text.js | 0
.../ace/src-noconflict}/mode-textile.js | 6 +-
.../ace/src-noconflict}/mode-tmsnippet.js | 4 +-
.../ace/src-noconflict}/mode-toml.js | 6 +-
.../ace/src-noconflict}/mode-twig.js | 622 +++++----
.../ace/src-noconflict}/mode-typescript.js | 38 +-
.../ace/src-noconflict}/mode-vbscript.js | 4 +-
.../ace/src-noconflict}/mode-velocity.js | 961 +++++++------
.../ace/src-noconflict}/mode-verilog.js | 4 +-
.../ace/src-noconflict}/mode-xml.js | 219 ++-
.../ace/src-noconflict}/mode-xquery.js | 38 +-
.../ace/src-noconflict}/mode-yaml.js | 8 +-
.../js/vendor/ace/src-noconflict/snippets/abap.js | 7 +
.../ace/src-noconflict/snippets/actionscript.js | 164 +++
.../js/vendor/ace/src-noconflict/snippets/ada.js | 7 +
.../vendor/ace/src-noconflict/snippets/asciidoc.js | 7 +
.../ace/src-noconflict/snippets/assembly_x86.js | 7 +
.../ace/src-noconflict/snippets/autohotkey.js | 7 +
.../ace/src-noconflict/snippets/batchfile.js | 7 +
.../vendor/ace/src-noconflict/snippets/c9search.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/c_cpp.js | 138 ++
.../vendor/ace/src-noconflict/snippets/clojure.js | 97 ++
.../js/vendor/ace/src-noconflict/snippets/cobol.js | 7 +
.../vendor/ace/src-noconflict/snippets/coffee.js | 102 ++
.../ace/src-noconflict/snippets/coldfusion.js | 7 +
.../vendor/ace/src-noconflict/snippets/csharp.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/css.js | 974 +++++++++++++
.../js/vendor/ace/src-noconflict/snippets/curly.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/d.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/dart.js | 89 ++
.../js/vendor/ace/src-noconflict/snippets/diff.js | 18 +
.../vendor/ace/src-noconflict/snippets/django.js | 115 ++
.../js/vendor/ace/src-noconflict/snippets/dot.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/ejs.js | 7 +
.../vendor/ace/src-noconflict/snippets/erlang.js | 167 +++
.../js/vendor/ace/src-noconflict/snippets/forth.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/ftl.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/glsl.js | 7 +
.../vendor/ace/src-noconflict/snippets/golang.js | 7 +
.../vendor/ace/src-noconflict/snippets/groovy.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/haml.js | 27 +
.../vendor/ace/src-noconflict/snippets/haskell.js | 89 ++
.../js/vendor/ace/src-noconflict/snippets/haxe.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/html.js | 835 ++++++++++++
.../ace/src-noconflict/snippets/html_ruby.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/ini.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/jade.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/java.js | 247 ++++
.../ace/src-noconflict/snippets/javascript.js | 202 +++
.../js/vendor/ace/src-noconflict/snippets/json.js | 7 +
.../vendor/ace/src-noconflict/snippets/jsoniq.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/jsp.js | 106 ++
.../js/vendor/ace/src-noconflict/snippets/jsx.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/julia.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/latex.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/less.js | 7 +
.../vendor/ace/src-noconflict/snippets/liquid.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/lisp.js | 7 +
.../ace/src-noconflict/snippets/livescript.js | 7 +
.../vendor/ace/src-noconflict/snippets/logiql.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/lsl.js | 894 ++++++++++++
.../js/vendor/ace/src-noconflict/snippets/lua.js | 28 +
.../vendor/ace/src-noconflict/snippets/luapage.js | 7 +
.../vendor/ace/src-noconflict/snippets/lucene.js | 7 +
.../vendor/ace/src-noconflict/snippets/makefile.js | 11 +
.../vendor/ace/src-noconflict/snippets/markdown.js | 94 ++
.../vendor/ace/src-noconflict/snippets/matlab.js | 7 +
.../vendor/ace/src-noconflict/snippets/mushcode.js | 7 +
.../src-noconflict/snippets/mushcode_high_rules.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/mysql.js | 7 +
.../ace/src-noconflict/snippets/objectivec.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/ocaml.js | 7 +
.../vendor/ace/src-noconflict/snippets/pascal.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/perl.js | 354 +++++
.../js/vendor/ace/src-noconflict/snippets/pgsql.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/php.js | 384 ++++++
.../ace/src-noconflict/snippets/plain_text.js | 7 +
.../ace/src-noconflict/snippets/powershell.js | 7 +
.../vendor/ace/src-noconflict/snippets/prolog.js | 7 +
.../ace/src-noconflict/snippets/properties.js | 7 +
.../vendor/ace/src-noconflict/snippets/python.js | 165 +++
.../js/vendor/ace/src-noconflict/snippets/r.js | 128 ++
.../js/vendor/ace/src-noconflict/snippets/rdoc.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/rhtml.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/ruby.js | 935 +++++++++++++
.../js/vendor/ace/src-noconflict/snippets/rust.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/sass.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/scad.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/scala.js | 7 +
.../vendor/ace/src-noconflict/snippets/scheme.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/scss.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/sh.js | 90 ++
.../vendor/ace/src-noconflict/snippets/snippets.js | 16 +
.../js/vendor/ace/src-noconflict/snippets/sql.js | 33 +
.../vendor/ace/src-noconflict/snippets/stylus.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/svg.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/tcl.js | 99 ++
.../js/vendor/ace/src-noconflict/snippets/tex.js | 197 +++
.../js/vendor/ace/src-noconflict/snippets/text.js | 7 +
.../vendor/ace/src-noconflict/snippets/textile.js | 37 +
.../js/vendor/ace/src-noconflict/snippets/toml.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/twig.js | 7 +
.../ace/src-noconflict/snippets/typescript.js | 7 +
.../vendor/ace/src-noconflict/snippets/vbscript.js | 7 +
.../vendor/ace/src-noconflict/snippets/velocity.js | 7 +
.../vendor/ace/src-noconflict/snippets/verilog.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/xml.js | 7 +
.../vendor/ace/src-noconflict/snippets/xquery.js | 7 +
.../js/vendor/ace/src-noconflict/snippets/yaml.js | 7 +
.../ace/src-noconflict}/theme-ambiance.js | 2 +-
.../ace/src-noconflict}/theme-chaos.js | 2 +-
.../ace/src-noconflict}/theme-chrome.js | 6 +-
.../ace/src-noconflict}/theme-clouds.js | 5 +-
.../ace/src-noconflict}/theme-clouds_midnight.js | 5 +-
.../ace/src-noconflict}/theme-cobalt.js | 9 +-
.../ace/src-noconflict}/theme-crimson_editor.js | 2 +-
.../ace/src-noconflict}/theme-dawn.js | 9 +-
.../ace/src-noconflict}/theme-dreamweaver.js | 6 +-
.../ace/src-noconflict}/theme-eclipse.js | 2 +-
.../ace/src-noconflict}/theme-github.js | 2 +-
.../ace/src-noconflict}/theme-idle_fingers.js | 8 +-
.../ace/src-noconflict}/theme-kr.js | 7 +-
.../ace/src-noconflict}/theme-merbivore.js | 5 +-
.../ace/src-noconflict}/theme-merbivore_soft.js | 5 +-
.../ace/src-noconflict}/theme-mono_industrial.js | 5 +-
.../ace/src-noconflict}/theme-monokai.js | 9 +-
.../ace/src-noconflict}/theme-pastel_on_dark.js | 5 +-
.../ace/src-noconflict}/theme-solarized_dark.js | 8 +-
.../ace/src-noconflict}/theme-solarized_light.js | 5 +-
.../ace/src-noconflict}/theme-terminal.js | 7 +-
.../ace/src-noconflict/theme-textmate.js} | 126 +-
.../ace/src-noconflict}/theme-tomorrow.js | 7 +-
.../ace/src-noconflict}/theme-tomorrow_night.js | 7 +-
.../src-noconflict}/theme-tomorrow_night_blue.js | 7 +-
.../src-noconflict}/theme-tomorrow_night_bright.js | 7 +-
.../theme-tomorrow_night_eighties.js | 7 +-
.../ace/src-noconflict}/theme-twilight.js | 9 +-
.../ace/src-noconflict}/theme-vibrant_ink.js | 2 +-
.../ace/src-noconflict}/theme-xcode.js | 2 +-
.../configuration/configuration_language.txt | 45 +-
.../configuration/configuring_big_file_upload.txt | 52 +-
core/doc/admin/_sources/configuration/index.txt | 11 +-
core/doc/admin/_sources/index.txt | 10 +-
core/doc/admin/configuration/auth_ldap.html | 34 +-
core/doc/admin/configuration/background_jobs.html | 24 +-
.../configuration/configuration_3rdparty.html | 14 +-
.../admin/configuration/configuration_apps.html | 12 +-
.../configuration/configuration_automation.html | 14 +-
.../configuration_custom_clients.html | 32 +-
.../configuration/configuration_database.html | 16 +-
.../configuration/configuration_encryption.html | 22 +-
.../configuration/configuration_knowledgebase.html | 16 +-
.../configuration/configuration_language.html | 88 +-
.../admin/configuration/configuration_logging.html | 14 +-
.../admin/configuration/configuration_mail.html | 14 +-
.../configuration/configuration_maintenance.html | 32 +-
.../configuration/configuration_reverseproxy.html | 16 +-
.../configuration/configuring_big_file_upload.html | 88 +-
.../admin/configuration/custom_mount_config.html | 14 +-
.../configuration/custom_mount_config_gui.html | 33 +-
.../admin/configuration/custom_user_backend.html | 14 +-
core/doc/admin/configuration/index.html | 26 +-
core/doc/admin/configuration/xsendfile.html | 16 +-
core/doc/admin/contents.html | 71 +-
core/doc/admin/index.html | 7 +
core/doc/admin/maintenance/index.html | 2 +-
core/doc/admin/searchindex.js | 2 +-
lib/public/share.php | 9 +-
lib/util.php | 4 +-
283 files changed, 19349 insertions(+), 6568 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