Commit Graph

  • ac3869bce5 Change name in more places develop Les De Ridder 2018-08-01 05:49:09 +0200
  • ab0b184646 Change default settings Les De Ridder 2018-07-31 23:06:11 +0200
  • 9a8a09354a Update name and repo Les De Ridder 2018-07-31 22:52:51 +0200
  • d23cf924c9 installDeps: replace GNU specific long options whith short ones "muxator ext:(%22) 2018-07-31 12:44:17 +0200
  • 65b9626669 dependencies: updated express & express-session muxator 2018-07-29 01:44:49 +0200
  • 1101c0279f dependencies: wd, 1.6.1 -> 1.10.3 muxator 2018-07-29 01:41:15 +0200
  • a0d5eb18a0 tests: introduce istanbul.js to check code coverage muxator 2018-07-28 03:33:55 +0200
  • f7000c786d tests: update mocha 5.0.5 -> 5.2.0 muxator 2018-07-28 01:02:43 +0200
  • 4e10f4d52a tests: sent Nyan Cat into eternal oblivion muxator 2018-07-28 00:30:43 +0200
  • 379690abbf tests: backend tests are now run with "npm test" instead of a custom bash script muxator 2018-07-28 00:26:39 +0200
  • 1a4a26fc73 tests: move mocha among devDependencies in package.json muxator 2018-07-27 22:31:35 +0200
  • 1f19b20796 tests: move supertest among devDependencies in package.json muxator 2018-07-27 22:30:20 +0200
  • cb8275fc4b docs: trivial corrections to test documentation muxator 2018-07-28 00:23:26 +0200
  • a3ae374a67 installDeps: made version detection more robust. Require Node >= 6.9, npm >= 3.10 muxator 2018-07-28 23:23:39 +0200
  • a69f8a3db9 runtime: deprecate Node <= 7. From Etherpad 1.8.0 minimum Node version will be 8 muxator 2018-07-27 01:51:28 +0200
  • 7544585908 runtime: enforce minimal node version to 6.9.0 muxator 2018-07-27 01:45:06 +0200
  • f1056bf01a docs: minimal revision muxator 2018-07-27 00:42:13 +0200
  • 7fa198d448 Localisation updates from https://translatewiki.net. translatewiki.net 2018-07-26 10:04:02 +0200
  • 42e0646327 Merge Firefox frontend test fixes muxator 2018-07-21 14:16:20 +0200
  • 4580537537 tests: fix frontend tests on firefox muxator 2018-07-20 23:58:47 +0200
  • a4c67f0d03
    Update package.json John McLear 2018-07-20 17:54:48 +0100
  • 60c1036ecb
    changelog: put <ol> in backticks muxator 2018-07-20 12:33:45 +0200
  • f17fe571df Use keydown instead of keypress on Firefox (cherry pick from 2be873e3c7) Mantary 2018-06-28 16:41:06 +0900
  • 2a876e5e9b Ensure that all lines in the pad are marked with class `ace-line`. Dan Bornstein 2016-09-13 01:17:04 +0200
  • f2b5f3bca2 tests: print expected & received output for 'getHTML' muxator 2018-07-17 00:46:52 +0200
  • 7c971f24aa Localisation updates from https://translatewiki.net. translatewiki.net 2018-07-16 16:51:53 +0200
  • b98ee116b9 Fix typos in ordinal names Dan Bornstein 2016-09-09 00:52:04 +0200
  • 937ca09d74 Correctly display plugin list in troubleshooting tab nashe 2018-06-02 20:27:41 +0200
  • c4918efc1b installDeps.sh: do not modify package.json when installing dependencies muxator 2018-07-14 17:54:26 +0200
  • 24b5817beb package.json: last reformatting muxator 2018-07-14 14:58:38 +0200
  • 896230ad7c package.json: whitespace changes muxator 2018-07-14 14:44:48 +0200
  • 7992316c23 package.json: sorted dependencies alphabetically muxator 2018-07-14 14:19:50 +0200
  • 58c3154769
    [fix] Ignore default line attribs when detecting edges of changeset (#3420) Luiza Pagliari 2018-07-09 17:44:38 -0300
  • 7729e5a1a9
    [fix:test] Use promise chain instead of chain (is deprecated) (#3419) Luiza Pagliari 2018-07-09 17:09:02 -0300
  • ad898b701a
    Update README.md John McLear 2018-07-09 15:45:46 +0100
  • 380889b218 Localisation updates from https://translatewiki.net. translatewiki.net 2018-07-02 07:56:19 +0200
  • 2be873e3c7 Use keydown instead of keypress on Firefox. Mantary 2018-06-28 16:41:06 +0900
  • f35d3456cf Fix FR dateformat Luc Didry 2018-06-14 11:47:51 +0200
  • 599b1f4568 Localisation updates from https://translatewiki.net. translatewiki.net 2018-06-28 07:21:00 +0200
  • dfd45f0f57 Localisation updates from https://translatewiki.net. translatewiki.net 2018-06-21 08:17:13 +0200
  • 3362c683bc Localisation updates from https://translatewiki.net. translatewiki.net 2018-06-14 12:22:22 +0200
  • d42393dc93 Localisation updates from https://translatewiki.net. translatewiki.net 2018-05-31 08:22:54 +0200
  • fe08d2a1db
    Merge pull request #3268 from citizenos/develop John McLear 2018-05-21 15:56:58 +0100
  • bacc37cf9b Localisation updates from https://translatewiki.net. translatewiki.net 2018-05-21 16:02:15 +0200
  • a96aa88dad merge with ether/etherpad-lite develop branch ilmar 2018-05-21 16:18:40 +0300
  • 4feccff530 merge with develop branch ilmar 2018-05-21 15:41:49 +0300
  • 3c66425b60 List indent fix ilmar 2018-05-21 13:07:08 +0300
  • 016497dbb4 prevLine/nextLine check fix ilmar 2018-05-14 22:57:15 +0300
  • 6dd172d6b7 Update settings.json.template Wikinaut 2018-05-11 01:14:47 +0200
  • 784bd8c7cc Update settings.json.template Wikinaut 2018-05-11 01:10:33 +0200
  • bfec44e346 Release version 1.6.6 muxator 2018-05-04 23:40:09 +0200
  • e13ae0aec5 changelog: better specified CVE description muxator 2018-05-04 23:24:58 +0200
  • 10d555bc91 changelog: better specified CVE description muxator 2018-05-04 23:15:22 +0200
  • 6dbeca217e createRelease.sh: changelog editing failed for multiline messages muxator 2018-05-04 00:36:09 +0200
  • 903a2c8e43 createRelease.sh: added error checking in modify_files() muxator 2018-05-03 23:54:08 +0200
  • 47e20a2f49 line parsing fix ilmar 2018-05-03 00:07:07 +0300
  • 6684f9bfe8 hook callAll to aCallAll ilmar 2018-05-02 11:45:48 +0300
  • 55ecf31786 html export fix ilmar 2018-05-02 11:12:58 +0300
  • c9863f81ad sync with ether/etherpad-lite ilmar 2018-05-02 11:08:57 +0300
  • 8d27f3cf03 upgrade to 1.6.5 ilmar 2018-04-24 13:31:40 +0300
  • 7cc7bb1abc upgrade to 1.6.5 ilmar 2018-04-24 12:25:56 +0300
  • d6fa065ef2 export html to original structure ilmar 2018-04-24 12:13:31 +0300
  • ba322012d7 Localisation updates from https://translatewiki.net. translatewiki.net 2018-04-23 08:52:57 +0200
  • 7b6a4aba30 Remove leftover code from earlier commits anugu-chegg 2018-04-20 01:36:30 +0530
  • b4068144c3 Refactor code anugu-chegg 2018-04-03 18:51:14 +0530
  • 461ed413b7 Fix few mistakes anugu-chegg 2018-02-16 01:31:47 +0530
  • d41e184a3c Send commits missed during the reconnect anugu-chegg 2018-02-14 13:18:44 +0530
  • bf05e9ae89 Handle client reconnect properly anugu-chegg 2018-02-10 22:30:22 +0530
  • 4265f4175e Handle socketio errors properly anugu-chegg 2018-02-05 22:37:49 +0530
  • fb20c26c5f Don't send COMMIT-MESSAGE when socketio connection is not active anugu-chegg 2018-02-03 13:29:52 +0530
  • d26df86490 made url relative Benjamin Schweizer 2016-02-19 10:07:01 +0100
  • 4f2ff31a61 Localisation updates from https://translatewiki.net. translatewiki.net 2018-04-19 09:20:05 +0200
  • 9daade0b95
    fix: line numbers was not aligned with text muxator 2018-04-13 18:32:39 +0200
  • 6dc8ead8c9 Localisation updates from https://translatewiki.net. translatewiki.net 2018-04-12 15:16:27 +0200
  • 686ce054fa Localisation updates from https://translatewiki.net. translatewiki.net 2018-04-12 09:12:18 +0200
  • 3eb3e301a2 manually updated CHANGELOG.md muxator 2018-04-10 00:44:14 +0200
  • 1d4e2b3b11 Release version 1.6.5 muxator 2018-04-10 00:17:34 +0200
  • 517b249394 D ilmar 2018-04-10 00:08:42 +0300
  • 92eee85f36 Escape data when listing available plugins nashe 2018-04-09 22:08:43 +0200
  • 5b1e1f0c35 Fix typo in `apicalls.js` which prevents from importing `isValidJSONPName`. Olivier Tétard 2018-04-07 16:07:38 +0200
  • 8502c04bee html lists export fix ilmar 2018-04-09 15:37:28 +0300
  • 1fdb01fd75 Localisation updates from https://translatewiki.net. translatewiki.net 2018-04-09 08:17:36 +0200
  • b16e7ad25e
    unbreak Safari iOS line wrapping John McLear 2018-04-07 18:11:24 +0100
  • fba2bf4df9
    Update iframe_editor.css John McLear 2018-04-07 17:50:45 +0100
  • 4c16ac4b47
    Merge pull request #3367 from ether/master John McLear 2018-04-07 11:05:58 +0100
  • 6a38826e9d
    Merge pull request #3366 from ether/release/1.6.4 John McLear 2018-04-07 11:05:31 +0100
  • fa83de778c Password check fix John McLear 2018-04-07 10:31:47 +0100
  • 6d5dc93dbf merged Peter 'Pita' Martischka 2018-04-07 10:23:49 +0100
  • 0132f4d1da Include CVE # John McLear 2018-04-07 10:13:09 +0100
  • c34350f307 Beginning to make release John McLear 2018-04-07 09:22:13 +0100
  • 76cd39d11a
    Merge pull request #17 from nashe/patch-admin-bypass John McLear 2018-04-06 21:27:16 +0100
  • ffe24c3dd9
    Update webaccess.js thomas 2018-04-06 22:21:33 +0200
  • e9f77e06a9 Merge branch 'develop' of https://github.com/ether/etherpad-lite into develop John McLear 2018-04-06 13:52:22 +0100
  • 86ec963775 Fixes #3137 John McLear 2018-04-06 13:52:04 +0100
  • 98a03b0867
    Update README.md John McLear 2018-04-06 13:51:08 +0100
  • 0225acfa06
    Update CONTRIBUTING.md John McLear 2018-04-06 10:40:36 +0100
  • 68d81e839c
    Update CONTRIBUTING.md John McLear 2018-04-06 10:38:14 +0100
  • b4ad7cf452 Export lists fix + code linting and readability update ilmar 2018-04-05 23:27:02 +0300
  • f00fc3a25f
    Merge pull request #13 from nashe/import_export_fix thomas 2018-04-04 22:55:49 +0200
  • a08c4383b8 check pad exists before importing / exporting Peter 'Pita' Martischka 2018-04-04 21:48:32 +0100