7f4cce789f
bump socketio
2020-06-07 13:47:58 +00:00
0669280af0
Revert "socketio230"
...
This reverts commit fbb7b5123b
2020-06-07 13:46:53 +00:00
fbb7b5123b
socketio230
2020-06-07 12:57:28 +00:00
6fad0210f8
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2020-06-07 12:56:20 +00:00
128f3e15eb
stalecode: jQuery 3 ( #3903 )
2020-06-07 12:01:14 +01:00
ea9a9cd883
Revert "Revert "stale: Terser instead of uglify ( #4075 )""
...
This reverts commit 423be7f081
2020-06-07 10:08:11 +00:00
d2a6d14fd1
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2020-06-07 10:08:02 +00:00
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
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
c5584fb5b4
editor: outdent on ol removal ( #4088 )
2020-06-07 09:51:12 +01:00
71a1f28ab9
tests: remote parallel runners, they defo causing issues at the moment ;(
2020-06-07 02:23:56 +00:00
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
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
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
e0ae5010ad
tests: testing parallel runners
2020-06-06 18:38:50 +00:00
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
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
423be7f081
Revert "stale: Terser instead of uglify ( #4075 )"
...
This reverts commit 552b6d7adb
2020-06-05 23:55:14 +00:00
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
16d9ca774b
tests: comment out some chat tests for now until we can find a fix
2020-06-05 23:23:00 +00:00
56cc2dca4c
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2020-06-05 23:08:58 +00:00
7985963354
comment out showchat test
2020-06-05 23:06:50 +00:00
552b6d7adb
stale: Terser instead of uglify ( #4075 )
2020-06-05 23:10:24 +01:00
56f6973209
import/export: Timeslider export links numeric pad IDs ( #4073 )
...
Fixes #4071
2020-06-05 22:50:55 +01:00
6dbfe5e43c
editor/ux: Clearauthorship on full doc selected
2020-06-05 22:47:12 +01:00
d4fcc23fb3
backups: include the pool every 100 revs stored ( #3991 )
2020-06-05 22:46:12 +01:00
fb68ac672b
tests: OL/UL further testing.
2020-06-05 22:18:58 +01:00
2b7931708b
bugfix: remove incorrectly committed package-lock.json
2020-06-05 20:37:35 +00:00
33ad48714c
stale code: update package-lock.json and force re-run tests
2020-06-05 20:04:50 +00:00
a4bdcc3392
tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes
...
1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
2020-06-05 20:54:16 +01:00
fc88f12bba
editor: ul/ol/li - outdent on ol and ul button press
2020-06-05 20:00:21 +01:00
13bd859f31
Import/export: Fix3032 - importing document botches pad options ( #3769 )
...
Fixes #3032
2020-06-05 19:58:25 +01:00
e859edd8ab
Docker: Don't copy backup files or Docker files into the image ( #4083 )
2020-06-05 19:48:54 +01:00
b51c85e458
tests: Use the correct Travis shield URI
2020-06-04 23:24:01 +01:00
dfada2c04a
housekeeping: Stale Github Issues ( #4082 )
2020-06-04 21:38:03 +01:00
76084820ca
tests: CSS frontend runner ( #4081 )
2020-06-04 17:03:25 +01:00
c9ffe59b55
Localisation updates from https://translatewiki.net .
2020-06-04 17:46:31 +02:00
d35f93ed50
Merge remote-tracking branch 'rhansen/fix-bad-conflict-resolution' into develop
2020-06-04 13:04:52 +00:00
c854cced65
performance: Use worker threads to minify JS/CSS files ( #3823 )
2020-06-04 14:00:50 +01:00
17a1b96736
bin: Fix 'for' loop style
2020-06-03 23:11:44 -04:00
4f0b1fa7ec
bin: Improve the run-as-root confirmation prompt
...
* Send the prompt to stderr
* Print "> " without a newline so the user knows it is a prompt
* Wrap long lines
* Use a here-document
2020-06-03 23:11:44 -04:00
18fb75968a
bin: Use ISO 8601 date format
2020-06-03 23:11:44 -04:00
edfe59e84f
bin: Improve restart notification email
2020-06-03 23:11:44 -04:00
98e6ec3517
bin: Log the date in the restart message
2020-06-03 23:11:44 -04:00
e4fec3883b
bin: Improve readability of email body
2020-06-03 23:11:44 -04:00
ab408ce653
bin: Put log parameter handling logic together
2020-06-03 23:11:44 -04:00
335705e03d
bin: Simplify cd to install dir
2020-06-03 23:11:44 -04:00
2f76066d95
bin: Simplify while loop condition
2020-06-03 23:11:44 -04:00
57237b8568
bin: Quote expansions that are subject to field splitting
2020-06-03 23:11:44 -04:00
a28b7c7595
bin: Use assertion-style condition checks
2020-06-03 23:11:44 -04:00
John McLear