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

5795 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
800e45585b Merge branch 'develop' of github.com:ether/etherpad-lite into gateway-timeout-during-tests 2020-05-28 13:25:20 +00: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
d3717ed4ce bring in other platforms 2020-05-28 13:01:55 +00:00
John McLear
671d823eee go go magic charms 2020-05-28 12:39:03 +00: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
13b4122cf5 disable travis cache 2020-05-28 12:29:23 +00:00
John McLear
42c86f5f14 test clean cache 2020-05-28 12:28:19 +00:00
John McLear
0d5690525d whoops :! 2020-05-28 11:06:47 +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
215572084e wut 2020-05-28 10:32:14 +00:00
John McLear
93e7e92dba zom 2020-05-28 10:22:19 +00:00
John McLear
c3c29dc1f5 tasty blueberries 2020-05-28 10:09:48 +00:00
John McLear
72d77cd044 wtd 2020-05-27 22:47:13 +00:00
John McLear
ecb5bbf6a7 trying this 2020-05-27 22:21:28 +00:00
John McLear
74108f5a4a hrm, is htis a chrome bug? 2020-05-27 16:35:18 +00: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
John McLear
275a70ecd9 pewpew 2020-05-27 15:08:04 +00:00
John McLear
2468c8ad95 attempt of sanity 2020-05-27 14:58:37 +00:00
John McLear
289e24a0a1 hrm saucelabs and travis are tripping 2020-05-27 14:56:59 +00:00
John McLear
9e4fb90d8a syntax 2020-05-27 14:40:40 +00:00
John McLear
cab9e0e7df testing this... 2020-05-27 14:37:56 +00: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