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
5462d2109c
bin: Create and use new logging functions
...
These write errors to stderr and avoid unintentional backslash escape
processing in their arguments.
2020-06-03 23:11:44 -04:00
a87a9bb63b
bin: Use `command` to check for commands
...
`command` is more idiomatic than `hash`. (Also, `hash` has side
effects.)
2020-06-03 23:11:44 -04:00
8e8b75be6c
bin: Use consistent comment formatting
2020-06-03 23:11:44 -04:00
be1f2152fc
bin: Use single equals sign for string comparison
...
Double equals is a non-POSIX bashism.
2020-06-03 23:11:44 -04:00
9ffb2ccfb0
Revert "scripts: Various shell script cleanups ( #4008 )"
...
This reverts commit fba4fd5314#4008 were squashed into a single
commit and rebased. Somewhere along the way a mistake was made in a
merge conflict resolution, resulting in some bad code in
`bin/buildForWindows.sh`. This commit reverts the bad squashed commit.
2020-06-03 23:11:44 -04:00
02af7d0c2d
tests: fix font select test
2020-06-03 10:34:13 +00:00
f925d5fc74
ui: Add a home icon ( #4076 )
...
This commit adds the fontawesome "home" icon, codepoint e80b
2020-06-03 10:56:24 +01:00
66a56234fa
docs: index hooks / ref #3978 ( #4077 )
2020-06-03 10:55:44 +01:00
df1629c7b9
tests: updating mocha and refactoring the custom html reporter using events
2020-06-03 10:54:55 +01:00
7aa7e02e27
Various UI improvement ( #4017 )
2020-06-02 10:25:43 +01:00
f45d85f615
editor: fix the wrong URL when we use etherpad without /p/ in the URL ( #4070 )
2020-06-01 22:12:42 +01:00
b1e50ab835
Localisation updates from https://translatewiki.net .
2020-06-01 22:30:02 +02:00
fba4fd5314
scripts: Various shell script cleanups ( #4008 )
2020-06-01 21:02:44 +01:00
0d51e71578
ux: Better ux for if cookies are disabled or not available.
2020-06-01 20:17:48 +01:00
a4713a8308
Docker: Abort image build when `npm install` fails ( #4026 )
...
Without this change, plugin install failures are silently ignored.
2020-06-01 20:16:08 +01:00
07c73d4f2d
webaccess: Log authentication attempts ( #4022 )
...
Addresses issue #4016 .
2020-06-01 20:11:57 +01:00
addb9b957a
import: Resolve error handling import causes instance crash
2020-06-01 20:09:10 +01:00
4497d37af9
tests: path to request require fix
2020-06-01 18:45:01 +00:00
John McLear