libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5894 commits 2 branches 0 tags 24 MiB
Commit graph

5894 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
8c669682c4
tests: remove another setTimeout for Edge tests.. 2020-05-29 21:06:38 +01:00
John McLear
cc606a24d7
tests: Edge test fixes and cruft removal. (#4061) 2020-05-29 20:46:07 +01:00
John McLear
174e68d468
tests: remove more edge settimeout issues (#4060) 2020-05-29 20:07:27 +01:00
John McLear
be2ba34d3c
tests: remove set timeouts to try fix edge remote tests 2020-05-29 19:45:28 +01:00
John McLear
3c190c1782
Another change to the test name to make it run last... 2020-05-29 18:27:16 +01:00
John McLear
e557723c8e
Renaming auto connection test 2020-05-29 17:52:00 +01:00
John McLear
59aab3676d
Revert "testing: New chrome testing hack slash workaround (#4055)" (#4057) 
This reverts commit 59b54b4772.
 2020-05-29 17:50:11 +01:00
John McLear
59b54b4772
testing: New chrome testing hack slash workaround (#4055) 
* testing this

* worth isolating
 2020-05-29 17:34:32 +01:00
John McLear
2011c24f57
editor: Don't restrict plugins from being able to bring in newline content 
#2412 broke this, it was discovered in https://github.com/JohnMcLear/ep_copy_paste_images/issues/20.

The limitation means that images can't be pasted within lists which IMHO is fine.  I could refine this down to OL only but I think images within lists would be fine not to include.
 2020-05-29 16:53:08 +01:00
John McLear
c6b5846172
tests: Fix backend testing which were always partially broken due to cache (#4053) 2020-05-29 13:26:34 +01:00
John McLear
00b6a1d9fe
Remove top console logs to stop hosted iFrames being broken. 2020-05-29 12:56:03 +01:00
John McLear
b2a723e57f
editor: Don't allow edits during reconnecting 
Not the best fix but better than the current status quo.
 2020-05-29 12:35:00 +01:00
John McLear
d8e067a5f9
tests: Resolve Gateway timeout during automated tests by adding delay after minify request 
* Remove npm cache from Travis, this was causing a world of pain.
* Remove the broken line attribute tests.
* Do a HTTP get against Etherpad to begin minification.
* Wait 10 seconds after minification before running tests.
 2020-05-29 12:28:31 +01:00
John McLear
b92b8a66e1
tests: Safari test fixes 
* fix safari font type select & remove buggy safari test, commenting for now as it will need fixing later
 2020-05-28 22:37:34 +01:00
John McLear
51eb1a7ce7
Tests: Fix Clear cookies test (#4050) 
* name uses a placeholder instead of a value so this should be nothing
 2020-05-28 15:27:48 +01:00
John McLear
40f36d7eb5
Tests: ShowChat fix (#4049) 
Resolves https://github.com/ether/etherpad-lite/issues/3541
 2020-05-28 15:18:13 +01:00
Daniel Krol
febd48954c
Tests: Add and test padPrefs for helper.newPad (#4042) 
Also fix a couple other tests along the way, including accounting for this change:

23307d14d5
 2020-05-28 14:25:07 +01:00
John McLear
b1b181927d Revert "Removing ep_test_line_attrib include" 
This reverts commit 9bca865b4f.
 2020-05-28 12:33:57 +00:00
John McLear
f775096696 Revert "Warning about Travis Cache" 
This reverts commit 5208ae5ee6.
 2020-05-28 12:33:44 +00:00
John McLear
5208ae5ee6
Warning about Travis Cache 
Intentionally committing to develop.  We can probably revert these two commits.
 2020-05-28 11:54:34 +01:00
John McLear
9bca865b4f
Removing ep_test_line_attrib include 
Intentionally committing directly to develop.  Removing ep_test_line_attrib because it's breaking other tests from running.

The weird thing is even when this is removed from other branches it appears to be included.  Hopefully committing directly to develop will make things work.
 2020-05-28 11:37:10 +01:00
John McLear
0dc59eba4d
tests: authorship test fix (#4001) 
* Placeholderfortest

* rename script and make it work
 2020-05-27 16:55:14 +01:00
John McLear
bcdb331c79
tests: Embed test fix (#4020) 
* quick fix for iframe code wihch someone broke

* Also fix cookie test
 2020-05-27 16:54:20 +01:00
translatewiki.net
66a43646a7 Localisation updates from https://translatewiki.net. 2020-05-26 17:05:30 +02:00
Daniel Krol
f79b50d311
Remove superfluous semicolon (#4037) 2020-05-21 16:43:15 +01:00
Daniel Krol
61c7bb9699
feat(i18n) Custom i18n strings (#4000) 
* Custom i18n strings (and some code formatting)

* Documentation for per-instance l10n overwrites
 2020-05-19 13:21:31 +01:00
translatewiki.net
170f471299 Localisation updates from https://translatewiki.net. 2020-05-18 16:03:29 +02:00
Richard Hansen
901a3f396e Revert "SessionStore: replace password with PASSWORD_HIDDEN when storing in db" 
This reverts commit 53f126082a, which
broke user authentication.

Fixes issue #4016.
Reopens issue #3421.
 2020-05-17 13:00:17 +02:00
muxator
4644e7a127 dependencies: update cookie-parser 1.4.4 -> 1.4.5 2020-05-15 13:09:56 +02:00
muxator
7ea85cbb03 dependencies: update wd 1.11.4 -> 1.12.1 
This is a dev dependency. No impact in production.
 2020-05-15 13:09:56 +02:00
muxator
026675170d dependencies: update mocha 7.1.1 -> 7.1.2 
This is a dev dependency. No impact in production.
 2020-05-15 13:09:56 +02:00
muxator
9da53707e4 dependencies: update nyc 15.0.0 -> 15.0.1 
This is a dev dependency. No impact in production.
 2020-05-15 13:09:56 +02:00
muxator
b5cf3cf718 dependencies: update request 2.88.0 -> 2.88.2 2020-05-15 13:09:56 +02:00
muxator
14b0c3a7bd dependencies: update express-session 1.17.0 -> 1.17.1 2020-05-15 13:09:56 +02:00
muxator
3e9def7017 dependencies: update graceful-fs 4.2.2 -> 4.2.4 2020-05-15 13:09:56 +02:00
muxator
738d573cc3 package-lock: regenerated with integrity-checked dependencies 2020-05-15 13:09:56 +02:00
muxator
7403a46d2e dependencies: update npm 6.14.4 -> 6.14.5 2020-05-15 13:09:56 +02:00
muxator
2087a2e564 startup: use "npm ci" instead of "npm install" in startup scripts 
Advantages:
- reproducible install: every user will have the same, exact install, instead of
  a slightly different one
- speed: installation of dependencies is measurably faster
- explicit: if a user setup is broken, from now on he'll have a clear error
  message

Fixes #3778
 2020-05-15 02:20:46 +02:00
muxator
4365598658 release: prepare for 1.8.4 2020-05-15 02:09:18 +02:00
muxator
37abb21a55 minify: rebase relative urls in imported files. 
4177b3f943 moved the font-face declarations from src/static/css/pad.css to two
imported files (src/static/css/pad/fonts.css, src/static/css/pad/toolbar.css)
in a different directory.

This results in the font files being invoked from CSSes residing in different
directories in the minified and un-minified case. URLs in the src attribute are
relative to the stylesheet path [0], and so we have to start requiring clean-css
to rebase them.

Before this change, the non minified casse worked by chance, because there were
a lot of "..", which ended up resolving to the root of the site anyways.

Fixes #3956

[0] https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src
 2020-05-15 01:29:13 +02:00
muxator
6dd9e9adc8 assets: also use cache busting via query string in files imported from acs.js 
Before this change, a client would require two versions of the same assets (with
and without randomVersionString), wasting resources and triggering all sorts of
hard to debug inconsistencies.

This change should have been part of 95fd5ce2a4 and completes it.
 2020-05-15 01:29:13 +02:00
brunob
edfc7a4916 bin: use correct ueberdb module path "ueberDB" -> "ueberdb2" in tools in /bin 
This change is analogous to #2998 (e11decc6f8).
 2020-05-15 01:22:41 +02:00
Sebastian Castro
d1d8a0ad6d gritter: remove close button added by external plugin 
We now already have a functional close button
 2020-05-15 01:08:40 +02:00
Sebastian Castro
17d09d2466 css: add missing text color for editorcontainer 
Now the content inside the editorcontainer will be correctly colored, like for
example table of content.
 2020-05-15 01:08:40 +02:00
Sebastian Castro
c8bf643c4e colibris: adds minimum height for scrollbar 
Otherwise when there is a lot of content, the scrollbar thumb is too small
 2020-05-15 01:08:40 +02:00
Sebastian Castro
ac850bfd47 css: fix wrapping, using normal white space and break-word 
Wrong config was causing copy paste to lose style attributes, and ep_align
justify to not work properly.
 2020-05-15 01:08:40 +02:00
Sebastian Castro
08930fae05 ui: add margin for titles 
No margin-top, because as title tags are contained inside magic-dom divs, all
the margin apply (they are not merged as usual).

Move some colibris rules into the skin independent rules.
 2020-05-15 01:08:40 +02:00
Sebastian Castro
373932a1df ui: prevent select value to overflow container 2020-05-15 01:08:40 +02:00
Sebastian Castro
4c8f60634e ui: use gritter to display error messages nicely (instead of loading box) 2020-05-15 01:08:40 +02:00
muxator
4816785aef doc: in the Docker example with custom plugins, replace ep_codepad -> ep_comments_page 
Prefer promoting ep_comments_page, since it has a wider audience and is better
maintained.
 2020-05-13 23:16:51 +02:00