Commit Graph

5914 Commits (f5b94bd6643a1441a83b64506b880160e33249df)

Author SHA1 Message Date
John McLear f5b94bd664 Update issue templates 2020-06-21 16:12:57 +01:00
John McLear 5f8c9ced39 Update issue templates 2020-06-21 16:08:53 +01:00
translatewiki.net 774a075cfc Localisation updates from https://translatewiki.net. 2020-06-18 21:14:49 +02:00
John McLear beccf677a4
bugfix: Fix #4120 where an author might not be populated on restart - if this is the case don't push the author to the array. 2020-06-17 10:54:10 +01:00
translatewiki.net d19937fa06 Localisation updates from https://translatewiki.net. 2020-06-15 22:11:47 +02:00
Stefan 9a22144a83
staleCode: Remove unnecessary robots.txt entry (#4113) 2020-06-14 20:49:13 +01:00
John McLear 045ac70db8
pluginfw: Make the NEW_CHANGES payload include the message in handleClientMessage 2020-06-12 12:26:33 +01:00
translatewiki.net 85383a316d Localisation updates from https://translatewiki.net. 2020-06-11 19:23:22 +02:00
John McLear e22574c40f
Changelog 2020-06-10 15:43:09 +01:00
John McLear 93829b9e33
pluginfw/performance: Dont cache if max age is 0 (#4098) 2020-06-08 17:21:55 +01:00
John McLear 3e78b79d9d
tests: no sauce tunnel on ALL test run
Speeds up tests and removes overhead
2020-06-08 17:18:22 +01:00
translatewiki.net 497704eb03 Localisation updates from https://translatewiki.net. 2020-06-08 17:03:38 +02:00
John McLear 5e887c02a8
tests: Travis conditional only run frontend tests if it's not a fork. (#4097) 2020-06-08 13:51:57 +01:00
John McLear 8f8a949155 tests: travis config 2020-06-08 11:45:03 +00:00
John McLear 9b875d934f
tests: using travis conditions to decide if front end tests should be run or not. (#4094) 2020-06-08 12:39:20 +01:00
John McLear 0158a4fa02 Revert "docker: use full node(not slim) so we have terser support"
This reverts commit fb163093e3.
2020-06-07 20:36:52 +00:00
John McLear fb163093e3 docker: use full node(not slim) so we have terser support 2020-06-07 20:31:41 +00:00
John McLear f1e3aff72f stale code: use terser instead of uglify 2020-06-07 20:09:10 +00:00
John McLear 166e1371da socket.io bump to 2.3.0 2020-06-07 19:12:11 +00:00
John McLear 512a51149d Revert "Merge branch 'develop' of github.com:ether/etherpad-lite into develop"
This reverts commit 6fad0210f8, reversing
changes made to 128f3e15eb.
2020-06-07 18:46:41 +00:00
John McLear 564e8fee07 forcing back to last known stable before parent merge 2020-06-07 18:44:01 +00:00
John McLear 49cd270592 including terser, again 2020-06-07 17:09:48 +00:00
John McLear 0ab9e1e8c3 ffs npm how you get so broke 2020-06-07 16:53:49 +00:00
John McLear 4b37034f0c ugh attempt to overwrite package files due to weirdness 2020-06-07 16:38:50 +00:00
John McLear b1ce372035 bump package lock 2020-06-07 13:57:58 +00:00
John McLear 009e1d01f7
staleCode: Async update 2020-06-07 14:56:45 +01:00
John McLear 0669280af0 Revert "socketio230"
This reverts commit fbb7b5123b.
2020-06-07 13:46:53 +00:00
John McLear fbb7b5123b socketio230 2020-06-07 12:57:28 +00:00
John McLear 6fad0210f8 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2020-06-07 12:56:20 +00:00
John McLear 128f3e15eb
stalecode: jQuery 3 (#3903) 2020-06-07 12:01:14 +01:00
John McLear ea9a9cd883 Revert "Revert "stale: Terser instead of uglify (#4075)""
This reverts commit 423be7f081.
2020-06-07 10:08:11 +00:00
John McLear d2a6d14fd1 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2020-06-07 10:08:02 +00:00
John McLear 7fa3cb35aa
tests: updating mocha and refactoring the custom html reporter using events
revert of revert of a revert.  doing it like this as to avoid having three reverts...
2020-06-07 11:07:15 +01:00
John McLear d1efa509e6 Revert "Revert "tests: updating mocha and refactoring the custom html reporter using events""
This reverts commit 2ce798339d.
2020-06-07 08:53:10 +00:00
John McLear c5584fb5b4
editor: outdent on ol removal (#4088) 2020-06-07 09:51:12 +01:00
John McLear 71a1f28ab9 tests: remote parallel runners, they defo causing issues at the moment ;( 2020-06-07 02:23:56 +00:00
John McLear 2cd3dccc4d Revert "Revert "Revert "editor: ul/ol/li - outdent on ol and ul button press"""
This reverts commit fd3980133d.
2020-06-06 20:51:17 +00:00
John McLear fd3980133d Revert "Revert "editor: ul/ol/li - outdent on ol and ul button press""
This reverts commit 82fb6ddc99.
2020-06-06 20:38:08 +00:00
John McLear 2ce798339d Revert "tests: updating mocha and refactoring the custom html reporter using events"
This reverts commit df1629c7b9.
2020-06-06 18:57:52 +00:00
John McLear e0ae5010ad tests: testing parallel runners 2020-06-06 18:38:50 +00:00
John McLear 82fb6ddc99 Revert "editor: ul/ol/li - outdent on ol and ul button press"
This reverts commit fc88f12bba.
2020-06-06 18:34:51 +00:00
John McLear aff93d24dd
export: txt import include correct OL prefix (#4086)
Includes test coverage
Final part of solving https://github.com/ether/etherpad-lite/issues/3447
2020-06-06 14:30:13 +01:00
John McLear 423be7f081 Revert "stale: Terser instead of uglify (#4075)"
This reverts commit 552b6d7adb.
2020-06-05 23:55:14 +00:00
John McLear b6bcdaf772 Revert "tests: comment out some chat tests for now until we can find a fix"
This reverts commit 16d9ca774b.
2020-06-05 23:54:57 +00:00
John McLear 16d9ca774b tests: comment out some chat tests for now until we can find a fix 2020-06-05 23:23:00 +00:00
John McLear 56cc2dca4c Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2020-06-05 23:08:58 +00:00
John McLear 7985963354 comment out showchat test 2020-06-05 23:06:50 +00:00
John McLear 552b6d7adb
stale: Terser instead of uglify (#4075) 2020-06-05 23:10:24 +01:00
John McLear 56f6973209
import/export: Timeslider export links numeric pad IDs (#4073)
Fixes #4071
2020-06-05 22:50:55 +01:00
John McLear 6dbfe5e43c
editor/ux: Clearauthorship on full doc selected 2020-06-05 22:47:12 +01:00