[Pkg-javascript-commits] [etherpad-lite] 10/17: Merge tag 'upstream/1.6.0'
Paolo Greppi
paolog-guest at moszumanska.debian.org
Wed Dec 14 21:56:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
paolog-guest pushed a commit to branch master
in repository etherpad-lite.
commit ec462da79edc331a93ee1bbc505283a708ffa18f
Merge: f6721ff f2e9829
Author: Paolo Greppi <paolo.greppi at libpf.com>
Date: Wed Dec 14 21:53:25 2016 +0100
Merge tag 'upstream/1.6.0'
Upstream version 1.6.0
.gitignore | 3 +
.travis.yml | 14 +-
CHANGELOG.md | 253 +++++-
CONTRIBUTING.md | 39 +-
LICENSE | 3 +-
Makefile | 2 +-
README.md | 87 +-
bin/backendTests.sh | 1 +
bin/buildDebian.sh | 44 +
bin/buildForWindows.sh | 25 +-
bin/{run.sh => cleanRun.sh} | 19 +-
bin/convert.js | 16 +-
bin/deb-src/DEBIAN/control | 9 +
bin/deb-src/DEBIAN/postinst | 7 +
bin/deb-src/DEBIAN/preinst | 26 +
bin/deb-src/DEBIAN/prerm | 4 +
bin/deb-src/sysroot/etc/init/etherpad.conf | 28 +
bin/debugRun.sh | 0
bin/dirty-db-cleaner.py | 45 +
{tools => bin}/doc/LICENSE | 0
{tools => bin}/doc/README.md | 2 +-
{tools => bin}/doc/generate.js | 0
{tools => bin}/doc/html.js | 0
{tools => bin}/doc/json.js | 0
{tools => bin}/doc/node_modules/.bin/marked | 0
{tools => bin}/doc/node_modules/marked/.npmignore | 0
{tools => bin}/doc/node_modules/marked/LICENSE | 0
{tools => bin}/doc/node_modules/marked/Makefile | 0
{tools => bin}/doc/node_modules/marked/README.md | 0
{tools => bin}/doc/node_modules/marked/bin/marked | 0
{tools => bin}/doc/node_modules/marked/index.js | 0
.../doc/node_modules/marked/lib/marked.js | 0
.../doc/node_modules/marked/man/marked.1 | 0
.../doc/node_modules/marked/package.json | 0
{tools => bin}/doc/package.json | 0
bin/installDeps.sh | 48 +-
bin/installOnWindows.bat | 5 -
bin/jshint.sh | 9 -
bin/loadTesting/README | 79 --
bin/loadTesting/launcher.sh | 16 -
bin/loadTesting/loader.js | 20 -
bin/migrateDirtyDBtoMySQL.js | 18 -
bin/migrateDirtyDBtoRealDB.js | 38 +
bin/rebuildPad.js | 123 +++
bin/repairPad.js | 106 +++
bin/run.sh | 15 +-
bin/safeRun.sh | 18 +-
bin/updatePlugins.sh | 20 +
doc/api/api.md | 4 +-
doc/api/editbar.md | 28 +
doc/api/editorInfo.md | 15 +-
doc/api/hooks_client-side.md | 133 ++-
doc/api/hooks_server-side.md | 217 ++++-
doc/api/http_api.md | 151 +++-
doc/api/toolbar.md | 46 ++
doc/assets/style.css | 7 +-
doc/custom_static.md | 2 +-
doc/documentation.md | 2 +-
doc/easysync/README.md | 2 +-
doc/easysync/easysync-full-description.tex | 6 +-
doc/easysync/easysync-notes.txt | 14 +-
doc/index.md | 1 +
doc/localization.md | 16 +-
doc/plugins.md | 4 +-
doc/stats.md | 18 +
doc/template.html | 4 +-
settings.json.template | 171 ++--
src/etherpad_icon.svg | 92 +++
src/locales/af.json | 6 +-
src/locales/ar.json | 200 +++--
src/locales/ast.json | 123 +--
src/locales/awa.json | 69 ++
src/locales/az.json | 195 ++---
src/locales/azb.json | 151 ++--
src/locales/bcc.json | 121 +++
src/locales/be-tarask.json | 131 +++
src/locales/bgn.json | 75 ++
src/locales/bn.json | 185 +++--
src/locales/br.json | 125 +--
src/locales/ca.json | 121 ++-
src/locales/cs.json | 196 +++--
src/locales/da.json | 86 +-
src/locales/de.json | 145 ++--
src/locales/diq.json | 121 +--
src/locales/dsb.json | 121 +++
src/locales/dty.json | 64 ++
src/locales/el.json | 232 +++---
src/locales/en-gb.json | 130 +++
src/locales/en.json | 86 +-
src/locales/eo.json | 131 +++
src/locales/es.json | 170 ++--
src/locales/et.json | 121 +++
src/locales/eu.json | 124 +++
src/locales/fa.json | 243 +++---
src/locales/fi.json | 146 ++--
src/locales/fo.json | 93 +++
src/locales/fr.json | 214 ++---
src/locales/gl.json | 124 +--
src/locales/gu.json | 56 ++
src/locales/he.json | 233 +++---
src/locales/hrx.json | 121 +++
src/locales/hsb.json | 126 +++
src/locales/hu.json | 206 ++---
src/locales/ia.json | 51 +-
src/locales/is.json | 130 +++
src/locales/it.json | 91 +-
src/locales/ja.json | 232 +++---
src/locales/km.json | 99 +++
src/locales/ko.json | 239 +++---
src/locales/ksh.json | 195 ++---
src/locales/ku-latn.json | 79 ++
src/locales/lb.json | 66 ++
src/locales/lki.json | 131 +++
src/locales/lrc.json | 78 ++
src/locales/lt.json | 100 +++
src/locales/lv.json | 87 ++
src/locales/map-bms.json | 117 +++
src/locales/mk.json | 229 +++---
src/locales/ml.json | 238 +++---
src/locales/mn.json | 76 ++
src/locales/mr.json | 56 ++
src/locales/ms.json | 49 +-
src/locales/nap.json | 106 +++
src/locales/nb.json | 132 +++
src/locales/nds.json | 118 +++
src/locales/ne.json | 109 +++
src/locales/nl.json | 64 +-
src/locales/nn.json | 63 +-
src/locales/oc.json | 115 +--
src/locales/olo.json | 54 ++
src/locales/os.json | 215 +++--
src/locales/pa.json | 129 +++
src/locales/pl.json | 174 ++--
src/locales/ps.json | 121 +--
src/locales/pt-br.json | 137 +--
src/locales/pt.json | 111 ++-
src/locales/ro.json | 98 +++
src/locales/ru.json | 235 +++---
src/locales/sco.json | 121 +++
src/locales/sd.json | 91 ++
src/locales/shn.json | 126 +++
src/locales/sk.json | 125 +++
src/locales/sl.json | 114 +--
src/locales/sq.json | 161 ++--
src/locales/sr-ec.json | 132 +++
src/locales/sv.json | 147 ++--
src/locales/te.json | 179 ++--
src/locales/tr.json | 134 +++
src/locales/uk.json | 245 +++---
src/locales/vi.json | 124 +++
src/locales/zh-hans.json | 233 +++---
src/locales/zh-hant.json | 239 +++---
src/node/db/API.js | 545 +++++++++++-
src/node/db/AuthorManager.js | 6 +-
src/node/db/DB.js | 2 +-
src/node/db/GroupManager.js | 27 +-
src/node/db/Pad.js | 237 +++++-
src/node/db/PadManager.js | 60 +-
src/node/db/ReadOnlyManager.js | 34 +-
src/node/db/SecurityManager.js | 55 +-
src/node/db/SessionManager.js | 26 +-
src/node/db/SessionStore.js | 6 +-
src/node/eejs/index.js | 28 +-
src/node/handler/APIHandler.js | 318 ++++++-
src/node/handler/ExportHandler.js | 273 +++---
src/node/handler/ImportHandler.js | 226 +++--
src/node/handler/PadMessageHandler.js | 695 +++++++++++-----
src/node/handler/SocketIORouter.js | 106 +--
src/node/hooks/express.js | 47 +-
src/node/hooks/express/adminplugins.js | 93 ++-
src/node/hooks/express/adminsettings.js | 5 +-
src/node/hooks/express/apicalls.js | 12 +-
src/node/hooks/express/errorhandling.js | 7 +-
src/node/hooks/express/importexport.js | 6 +-
src/node/hooks/express/padreadonly.js | 57 +-
src/node/hooks/express/padurlsanitize.js | 25 +-
src/node/hooks/express/socketio.js | 65 +-
src/node/hooks/express/specialpages.js | 51 +-
src/node/hooks/express/static.js | 10 +-
src/node/hooks/express/swagger.js | 22 +-
src/node/hooks/express/tests.js | 13 +-
src/node/hooks/express/webaccess.js | 34 +-
src/node/hooks/i18n.js | 3 +-
src/node/padaccess.js | 6 +-
src/node/server.js | 15 +-
src/node/stats.js | 3 +
src/node/utils/Abiword.js | 19 +-
src/node/utils/ExportDokuWiki.js | 350 --------
src/node/utils/ExportEtherpad.js | 79 ++
src/node/utils/ExportHelper.js | 15 +-
src/node/utils/ExportHtml.js | 452 +++++-----
src/node/utils/ExportTxt.js | 9 +-
src/node/utils/ImportEtherpad.js | 74 ++
src/node/utils/ImportHtml.js | 27 +-
src/node/utils/LibreOffice.js | 93 +++
src/node/utils/Minify.js | 24 +-
src/node/utils/RemoteAddress.js | 1 +
src/node/utils/Settings.js | 268 +++++-
src/node/utils/TidyHtml.js | 41 +
src/node/utils/caching_middleware.js | 7 +-
src/node/utils/padDiff.js | 54 +-
src/node/utils/randomstring.js | 13 +-
src/node/utils/tar.json | 5 +-
src/node/utils/toolbar.js | 265 ++++++
src/package.json | 72 +-
src/static/css/admin.css | 73 +-
src/static/css/iframe_editor.css | 219 ++++-
src/static/css/pad.css | 490 ++++++++---
src/static/css/timeslider.css | 176 ++--
src/static/favicon.ico | Bin 1150 -> 4286 bytes
src/static/font/config.json | 352 ++++++++
src/static/font/fontawesome-etherpad.eot | Bin 0 -> 18520 bytes
src/static/font/fontawesome-etherpad.svg | 68 ++
src/static/font/fontawesome-etherpad.ttf | Bin 0 -> 18304 bytes
src/static/font/fontawesome-etherpad.woff | Bin 0 -> 10792 bytes
src/static/font/opendyslexic.otf | Bin 0 -> 48076 bytes
src/static/img/backgrad.gif | Bin 697 -> 0 bytes
src/static/img/connectingbar.gif | Bin 10932 -> 0 bytes
src/static/img/crushed_button_depressed.png | Bin 4134 -> 0 bytes
src/static/img/crushed_button_undepressed.png | Bin 4166 -> 0 bytes
src/static/img/crushed_current_location.png | Bin 1009 -> 0 bytes
src/static/img/etherpad_lite_icons.png | Bin 8318 -> 0 bytes
src/static/img/fileicons.gif | Bin 1649 -> 0 bytes
src/static/img/gritter.png | Bin 4880 -> 0 bytes
src/static/img/leftarrow.png | Bin 494 -> 0 bytes
src/static/img/loading.gif | Bin 658 -> 0 bytes
src/static/img/pause.png | Bin 2883 -> 0 bytes
src/static/img/play.png | Bin 3017 -> 0 bytes
src/static/img/roundcorner_left.gif | Bin 123 -> 0 bytes
src/static/img/roundcorner_right.gif | Bin 131 -> 0 bytes
src/static/img/star.png | Bin 3241 -> 0 bytes
src/static/img/stepper_buttons.png | Bin 4858 -> 0 bytes
src/static/img/timeslider_background.png | Bin 182 -> 0 bytes
src/static/img/timeslider_left.png | Bin 686 -> 0 bytes
src/static/img/timeslider_right.png | Bin 517 -> 0 bytes
src/static/js/AttributeManager.js | 348 ++++++--
src/static/js/Changeset.js | 87 +-
src/static/js/ace.js | 45 +-
src/static/js/ace2_inner.js | 915 +++++++++++++--------
src/static/js/admin/plugins.js | 355 ++++----
src/static/js/admin/settings.js | 5 +-
src/static/js/broadcast.js | 55 +-
src/static/js/broadcast_slider.js | 66 +-
src/static/js/browser.js | 306 +++++++
src/static/js/changesettracker.js | 50 ++
src/static/js/chat.js | 204 +++--
src/static/js/collab_client.js | 59 +-
src/static/js/contentcollector.js | 115 ++-
src/static/js/cssmanager.js | 32 +-
src/static/js/domline.js | 50 +-
src/static/js/draggable.js | 197 -----
src/static/js/farbtastic.js | 6 +-
src/static/js/gritter.js | 4 +-
src/static/js/html10n.js | 406 +++++----
src/static/js/jquery_browser.js | 50 --
src/static/js/linestylefilter.js | 20 +-
src/static/js/pad.js | 282 ++++---
src/static/js/pad_connectionstatus.js | 8 +-
src/static/js/pad_editbar.js | 426 +++++++---
src/static/js/pad_editor.js | 74 +-
src/static/js/pad_impexp.js | 64 +-
src/static/js/pad_modals.js | 21 +-
src/static/js/pad_savedrevs.js | 11 +-
src/static/js/pad_userlist.js | 53 +-
src/static/js/pad_utils.js | 11 +-
src/static/js/pluginfw/hooks.js | 6 +-
src/static/js/pluginfw/installer.js | 173 ++--
src/static/js/pluginfw/plugins.js | 11 +
src/static/js/rjquery.js | 7 +-
src/static/js/timeslider.js | 50 +-
src/static/js/virtual_lines.js | 388 ---------
src/templates/admin/index.html | 48 +-
src/templates/admin/plugins-info.html | 9 +-
src/templates/admin/plugins.html | 213 ++---
src/templates/admin/settings.html | 98 +--
src/templates/index.html | 46 +-
src/templates/pad.html | 195 ++---
src/templates/timeslider.html | 90 +-
tests/README.md | 9 +
tests/backend/loadSettings.js | 17 +
tests/backend/specs/api/chat.js | 114 +++
tests/backend/specs/api/pad.js | 617 ++++++++++++++
tests/backend/specs/api/sessionsAndGroups.js | 365 ++++++++
tests/backend/specs/api/tidy.js | 63 ++
tests/frontend/index.html | 3 +-
tests/frontend/lib/jquery.iframe.js | 5 +-
tests/frontend/lib/sendkeys.js | 606 +++++++-------
tests/frontend/runner.js | 11 +-
tests/frontend/specs/alphabet.js | 2 +-
tests/frontend/specs/bold.js | 3 +-
tests/frontend/specs/caret.js | 344 ++++++++
tests/frontend/specs/chat.js | 33 +-
tests/frontend/specs/clear_authorship_colors.js | 5 +
tests/frontend/specs/font_type.js | 3 +-
tests/frontend/specs/helper.js | 58 +-
tests/frontend/specs/importexport.js | 237 ++++++
tests/frontend/specs/importindents.js | 111 +++
tests/frontend/specs/indentation.js | 110 ++-
tests/frontend/specs/italic.js | 2 +-
tests/frontend/specs/language.js | 44 +-
tests/frontend/specs/redo.js | 2 +-
tests/frontend/specs/responsiveness.js | 80 ++
tests/frontend/specs/timeslider_revisions.js | 14 +-
tests/frontend/specs/undo.js | 2 +-
tests/frontend/specs/unordered_list.js | 35 +
tests/frontend/specs/urls_become_clickable.js | 2 +-
tests/frontend/travis/remote_runner.js | 10 +-
tests/frontend/travis/runner.sh | 2 +-
tests/frontend/travis/sauce_tunnel.sh | 2 +-
309 files changed, 20243 insertions(+), 8052 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/etherpad-lite.git
More information about the Pkg-javascript-commits
mailing list