mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-27 10:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
5899 commits 215 branches 107 tags 73 MiB
Commit graph

5899 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
b910078178 clean up 2020-06-07 08:24:07 +00:00
John McLear
3b75ba107b
no let 2020-06-07 09:16:02 +01:00
John McLear
394c0631e3 resolve conflict 2020-06-07 07:28:38 +00:00
John McLear
3d0c7166f4 allow tests to run 2020-06-07 07:27:41 +00: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
ec6480aa39 trying something else.. #2 2020-06-06 23:34:12 +00:00
John McLear
f35100a7bd trying something else.. 2020-06-06 23:17:08 +00:00
John McLear
3eec0a0f7f lets try this 2020-06-06 22:55:32 +00:00
John McLear
34ea1e0438 Revert "Revert "outdent on ol"" 
This reverts commit e0fd8f8523.
 2020-06-06 22:54:27 +00:00
John McLear
d292ed6678 Revert "tests: testing parallel runners" 
This reverts commit e0ae5010ad.
 2020-06-06 22:27:28 +00:00
John McLear
f18d3f7c46 comment out text 2020-06-06 22:20:37 +00:00
John McLear
e0fd8f8523 Revert "outdent on ol" 
This reverts commit 58f9d8805a.
 2020-06-06 22:13:39 +00:00
John McLear
cc2736ae3d Revert "remove cruft" 
This reverts commit 1cff58fec8.
 2020-06-06 22:13:32 +00:00
John McLear
5174937392 Revert "remember-to-define" 
This reverts commit d13f968752.
 2020-06-06 22:13:08 +00:00
John McLear
3f44441a87 Revert "ugh wtf" 
This reverts commit 91966533df.
 2020-06-06 22:13:02 +00:00
John McLear
76d2900790 Revert "testing this" 
This reverts commit 1b82cef363.
 2020-06-06 22:12:44 +00:00
John McLear
1b82cef363 testing this 2020-06-06 21:57:14 +00:00
John McLear
91966533df ugh wtf 2020-06-06 21:56:23 +00:00
John McLear
d13f968752 remember-to-define 2020-06-06 21:45:46 +00:00
John McLear
1cff58fec8 remove cruft 2020-06-06 21:41:41 +00:00
John McLear
58f9d8805a outdent on ol 2020-06-06 21:27:29 +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
John McLear
d4fcc23fb3
backups: include the pool every 100 revs stored (#3991) 2020-06-05 22:46:12 +01:00
John McLear
fb68ac672b
tests: OL/UL further testing. 2020-06-05 22:18:58 +01:00
John McLear
2b7931708b bugfix: remove incorrectly committed package-lock.json 2020-06-05 20:37:35 +00:00
John McLear
33ad48714c stale code: update package-lock.json and force re-run tests 2020-06-05 20:04:50 +00:00
John McLear
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
John McLear
fc88f12bba
editor: ul/ol/li - outdent on ol and ul button press 2020-06-05 20:00:21 +01:00
John McLear
13bd859f31
Import/export: Fix3032 - importing document botches pad options (#3769) 
Fixes #3032
 2020-06-05 19:58:25 +01:00
Richard Hansen
e859edd8ab
Docker: Don't copy backup files or Docker files into the image (#4083) 2020-06-05 19:48:54 +01:00
John McLear
b51c85e458
tests: Use the correct Travis shield URI 2020-06-04 23:24:01 +01:00
John McLear
dfada2c04a
housekeeping: Stale Github Issues (#4082) 2020-06-04 21:38:03 +01:00
John McLear
76084820ca
tests: CSS frontend runner (#4081) 2020-06-04 17:03:25 +01:00
translatewiki.net
c9ffe59b55 Localisation updates from https://translatewiki.net. 2020-06-04 17:46:31 +02:00
John McLear
d35f93ed50 Merge remote-tracking branch 'rhansen/fix-bad-conflict-resolution' into develop 2020-06-04 13:04:52 +00:00
Chocobozzz
c854cced65
performance: Use worker threads to minify JS/CSS files (#3823) 2020-06-04 14:00:50 +01:00
Richard Hansen
17a1b96736 bin: Fix 'for' loop style 2020-06-03 23:11:44 -04:00