423be7f081
Revert "stale: Terser instead of uglify ( #4075 )"
...
This reverts commit 552b6d7adb
2020-06-05 23:55:14 +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
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
c9ffe59b55
Localisation updates from https://translatewiki.net .
2020-06-04 17:46:31 +02:00
c854cced65
performance: Use worker threads to minify JS/CSS files ( #3823 )
2020-06-04 14:00:50 +01: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
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
0d51e71578
ux: Better ux for if cookies are disabled or not available.
2020-06-01 20:17:48 +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
f84837ef9b
plugins: add hooks for index.html template
...
ref #3978
2020-06-01 19:43:11 +01:00
2c944eba34
minification: use mime lookup for mime types ( #3979 )
2020-06-01 19:37:54 +01:00
71bffed190
tests: fix for fuzz tests ( #4068 )
2020-06-01 18:52:46 +01:00
0b7ace83d5
ui: hide create/open pad buttons on index page ( #3974 )
...
if requireSession or editOnly is set these buttons always fail
2020-06-01 18:28:13 +01:00
bfca481b0b
import: setting for allowing import without author existing
2020-06-01 18:19:06 +01:00
cffd04446e
admin: Add etherpad update check
...
This update check notifies admin on startup (via console) or in /admin UI that they need to update Etherpad.
2020-06-01 17:57:53 +01:00
8deac52c84
tests: include mocha froth in package lock and better syntax for package.json
2020-06-01 16:35:38 +00:00
dc11b85e62
tests: fuzzing, binary imports
2020-06-01 17:26:55 +01:00
59b1a2d5e0
performance: add template cache for quicker page renders
2020-06-01 15:00:47 +01:00
7273778e5f
doh, recommit package-lock
2020-05-30 18:40:44 +00:00
add3b23f66
tests: load testing into core
2020-05-30 18:17:33 +00:00
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
00b6a1d9fe
Remove top console logs to stop hosted iFrames being broken.
2020-05-29 12:56:03 +01:00
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
40f36d7eb5
Tests: ShowChat fix ( #4049 )
...
Resolves https://github.com/ether/etherpad-lite/issues/3541
2020-05-28 15:18:13 +01:00
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
66a43646a7
Localisation updates from https://translatewiki.net .
2020-05-26 17:05:30 +02:00
f79b50d311
Remove superfluous semicolon ( #4037 )
2020-05-21 16:43:15 +01:00
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
170f471299
Localisation updates from https://translatewiki.net .
2020-05-18 16:03:29 +02:00
901a3f396e
Revert "SessionStore: replace password with PASSWORD_HIDDEN when storing in db"
...
This reverts commit 53f126082a#4016 .
Reopens issue #3421 .
2020-05-17 13:00:17 +02:00
4644e7a127
dependencies: update cookie-parser 1.4.4 -> 1.4.5
2020-05-15 13:09:56 +02:00
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
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
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
b5cf3cf718
dependencies: update request 2.88.0 -> 2.88.2
2020-05-15 13:09:56 +02:00
14b0c3a7bd
dependencies: update express-session 1.17.0 -> 1.17.1
2020-05-15 13:09:56 +02:00
3e9def7017
dependencies: update graceful-fs 4.2.2 -> 4.2.4
2020-05-15 13:09:56 +02:00
738d573cc3
package-lock: regenerated with integrity-checked dependencies
2020-05-15 13:09:56 +02:00
7403a46d2e
dependencies: update npm 6.14.4 -> 6.14.5
2020-05-15 13:09:56 +02:00
4365598658
release: prepare for 1.8.4
2020-05-15 02:09:18 +02:00
37abb21a55
minify: rebase relative urls in imported files.
...
4177b3f943Fixes #3956
[0] https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src
2020-05-15 01:29:13 +02:00
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
2020-05-15 01:29:13 +02:00
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
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
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
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
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
373932a1df
ui: prevent select value to overflow container
2020-05-15 01:08:40 +02:00
4c8f60634e
ui: use gritter to display error messages nicely (instead of loading box)
2020-05-15 01:08:40 +02:00
95fd5ce2a4
assets: add random string to query string to bust cache on restart and deploys
...
After each Eterpad restart, the clients will request a new version of the
static assets, even if they are not modified. This is the price we pay for
knowing that no stale files are going to be served ever again. We could also
have used a salted hash of the Etherpad version, but we chose the simpler way.
For the rationale behind using a random string at each restart, see #3958 .
ACHTUNG: this may prevent caching HTTP proxies to work.
Closes #3955 .
2020-05-13 18:58:26 +02:00
fda0d2884e
iframe attribute: move quote
2020-05-13 18:51:09 +02:00
253545712e
Localisation updates from https://translatewiki.net .
2020-05-11 17:36:12 +02:00
77b64bc4bc
Localisation updates from https://translatewiki.net .
2020-05-07 17:08:23 +02:00
5f686a8acb
ueberdb: update 0.4.5 -> 0.4.9 to fix a performance regression ( #3975 )
2020-05-07 11:57:42 +01:00
82d1179f24
timeslider: important fix pad content was cropped when bigger than screen size
2020-05-05 12:54:11 +02:00
c7e86d38ff
Localisation updates from https://translatewiki.net .
2020-05-04 15:50:46 +02:00
88dccfe7ce
ui: remove no more needed css code for ep_author_neat
...
This is the last change in PR #3957 .
Closes #3954 .
2020-05-03 22:36:14 +02:00
9587c1c673
ui: change a bit the architecture of sidediv line number
...
So we can easily customize with plugins, such as ep_author_neat
2020-05-03 22:36:14 +02:00
a522db3ef4
colibris: do not color link with primary color when author color are on
...
Change link color to blue
Still color the link the authorship have been cleared
closes #3960
2020-05-03 22:36:14 +02:00
ff1191d24a
toolbar: display the "+" icon to show all buttons only on mobile layout
...
Otherwise the "+" button is displayed on top of the menu_right toolbar
2020-05-03 22:36:14 +02:00
f768e32373
ui: apply mobile layout if screen width < 800px instead of < 720px
...
Some mobile get large screen now, and also if using a small window on desktop better adapt the visual using mobile layout
2020-05-03 22:36:14 +02:00
01c59b3b88
colibris: apply skin variants to set_title_on_pad
2020-05-03 22:36:14 +02:00
15af63b0f8
ui: display editor only when it is ready
...
so it avoid strange ui effect when div get positioned
2020-05-03 22:36:14 +02:00
d5020f53ab
colibris: Fix index page font and colors
2020-05-03 22:36:14 +02:00
af67f02da2
select: remove nice-select for safari because of a known bug with fixed position and overflow
...
Make the safari select looks the same than for other browser
Only the dropdown will be different
2020-05-03 22:36:14 +02:00
23307d14d5
share: change default iframe size, and remove border
...
From 600*400 to 100%*600
2020-05-03 22:36:14 +02:00
3ac816da2b
colibris: gritter color always in white
2020-05-03 22:36:14 +02:00
bd443a7f58
colibris: remove old styling for titles inside editor. Leave ep_headings manage it
2020-05-03 22:36:14 +02:00
9abc70e389
package-lock: update version field
...
This was reported in
5e6af287a5 (r38792267)5e6af287a5
2020-05-02 00:16:35 +02:00
fe6828338b
Localisation updates from https://translatewiki.net .
2020-04-30 16:48:33 +02:00
6f56830347
Localisation updates from https://translatewiki.net .
2020-04-27 16:45:06 +02:00
5e6af287a5
release: prepare for 1.8.3
2020-04-27 03:24:23 +02:00
452db293b0
changeset.js: do not lose sync in the timeslider if another user deletes text
...
If a user deleted text/attributes while another one had the timeslider open,
the timeslider lost sync and spit out errors.
Fixes #3932 .
2020-04-27 02:12:17 +02:00
7bdc9d8a57
dependencies: update npm 6.14.3 -> 6.14.4
...
For the first time in a VERY long time, we now have exactly 0 vulnerabilities
reported by npm audit.
=====
BEFORE:
$ npm audit
=== npm audit security report ===
┌──────────────────────────────────────────────────────────────────────────────┐
│ Manual Review │
│ Some vulnerabilities require your attention to resolve │
│ │
│ Visit https://go.npm.me/audit-guide for additional guidance │
└──────────────────────────────────────────────────────────────────────────────┘
[...]
found 4 low severity vulnerabilities in 13796 scanned packages
4 vulnerabilities require manual review. See the full report for details.
=====
AFTER:
$ npm audit
=== npm audit security report ===
found 0 vulnerabilities
in 13796 scanned packages
2020-04-26 23:13:10 +02:00
6cb78e51b0
pad.js: wait write callback instead of buffer callback
2020-04-26 04:14:19 +02:00
53003d4471
pad.js: fix freeze on pad deletion when it has many revisions
2020-04-26 04:14:19 +02:00
09ddfb9e20
pad_impexp: close modal on succesful import
2020-04-21 15:03:09 +00:00
de09b9a410
ace2_inner: reformatting, no functional changes
2020-04-21 15:02:58 +00:00
c9a9b7ae42
pad.js: in switchToPad() remove the first iframe before loading the pad
...
This is an old bug: after an import there were always two iframes with
duplicated content, and the last one was simply on top of the old one.
This bug was there since forever, and became evident when the layout was
migrated to Flexbox.
2020-04-26 03:31:02 +02:00
a471dbeebf
html10n: do a lax match between the Accept-Language header and available locales
...
Before this change, we simply generated an error.
For example:
- if the browser sent 'ru-RU', but Etherpad has 'ru' available, select 'ru';
- if the browser sent 'zh', but we have 'zh-hans' available, use 'zh-hans'.
Fixes #3882 .
2020-04-26 03:07:01 +02:00
e8cd83286d
css: fix timeslider toolbar on mobile when multiple authors are displayed ( #3933 )
2020-04-24 20:56:30 +01:00
01497aa399
SecurityManager: clarify the role of the token parameter (and cookie)
...
"token" is a random token representing the author, of the form
t.randomstring_of_lenght_20. The random string is generated by the client. The
cookie is used for every pad in the web UI, and is not used for HTTP API.
This comes from the discussion at https://github.com/ether/etherpad-lite/issues/3563
2020-04-24 02:55:20 +02:00
1bd595fdc7
ace2_inner: prefix all logging statements: "console.*" -> "top.console.*"
...
For reference, see:
https://github.com/ether/etherpad-lite/pull/3915#issuecomment-617681463
2020-04-22 22:19:40 +02:00
789dd7acd6
skin builder: add coma at the end of the generated code
...
Closes #3919
2020-04-22 22:02:25 +02:00
208c7a849c
pad.html: UI telling the user that a contribution is required before importing
...
This commit is an integration to 24ee37a38f
2020-04-22 21:12:49 +02:00
c6cb253f76
ImportHandler: UI for showing maxFileSize error on import
...
This commit is an integration to f4418149cb
2020-04-14 10:02:21 +00:00
53d8e32ecb
messages: "install AbiWord" -> "install AbiWord or LibreOffice"
2020-04-14 09:43:21 +00:00
ffa7244e81
ace2_inner: close all gritters when hitting escape key
2020-04-22 01:51:59 +02:00
51d924c1f8
css: Fix last commit overflow should not apply to inner-editors ( #3914 )
...
* css: Fix last commit overflow should not apply to inner-editors
* css: hide toolbar popup and nice-select when clicking on pad
2020-04-21 22:46:54 +01:00
7ec3be640b
specialpages: do not set a language cookie if the browser did not send one
...
In this way, if the browser sends a list of preferred languages via
Accept-Language HTTP header, Etherpad will honor that.
Before this change, Etherpad always forced on the user the language from
padOptions.lang in settings.json.
This reverts a feature that was introduced in 295672f598
2020-04-19 19:56:16 +02:00
cb785590bc
css: some fix for browser compatibility refs #3907 ( #3913 )
2020-04-21 14:33:53 +01:00
9882362e2e
settings: clarify that null defaults are supported, using the syntax "${VAR_NAME}"
...
Using "${VAR_NAME:null}", instead, would define the literal string "null".
2020-04-21 04:44:56 +02:00
68ff6d497d
Localisation updates from https://translatewiki.net .
2020-04-20 16:52:37 +02:00
84d82b506b
css: Fix some problems with new UI refs #3907 ( #3908 )
...
* css: Fix sidedivinner padding creating ui problems refs #3907
* css: Fix colorpicker for mobile
2020-04-20 14:51:02 +01:00
4ceb42603e
css: Fixes #3900 innerdocbodyu Layout broken for safari ( #3906 ) and other browsers
2020-04-20 09:47:52 +01:00
da0ea3a29d
tests: avoid ERR_TOO_MANY_REDIRECTS on frontend tests under Windows
...
If Etherpad is hosted on Windows the frontend test URI needs to be
/tests/frontend/index.html (docs say .../frontend/), otherwise there is this
error: ERR_TOO_MANY_REDIRECTS.
Fixes #3804 .
2020-04-20 01:48:23 +02:00
51e40ddbc9
ace2_inner: when atext.text is "", replace with "\n"
...
The server is fine with atext.text being an empty string, but the front end is
not, and crashes.
It is not clear if this is a problem in the server or in the client code, and
this is a client-side hack fix. The underlying problem needs to be
investigated.
See for reference:
- https://github.com/ether/etherpad-lite/issues/3861
2020-04-20 00:49:50 +02:00
70990afd66
Change favicon to be closer to new style
2020-04-19 18:20:21 +02:00
48b0290977
AbsolutePaths: be able to read the git commit version independently on CWD
...
--HG--
branch : absolute-paths
2020-04-19 04:51:50 +02:00
72ccb28382
AbsolutePaths: initial work to allow Etherpad to be run without changing CWD
...
With this change, it is no longer necessary to "cd" to the Etherpad base
directory to start it: Etherpad runs from everywhere.
Known issues:
- unless the program is started as before (CWD == base directory) it is still
not possible to install & uninstall plugins via the web interface
--HG--
branch : absolute-paths
2020-04-19 04:51:50 +02:00
be3d158402
pad.html: use TLS for the "Powered by" link: http://etherpad.org -> https://etherpad.org
2020-04-19 03:24:47 +02:00
03227e526f
css: fix toolbar overlay so it cover only toolbar and not the whole screen
...
This allows to copy & paste the pad text even when disconnected.
2020-04-19 03:03:44 +02:00
4593c4be7c
users: remove hardcoded color for editempty. Use opacity instead
2020-04-19 03:03:44 +02:00
cbd9378908
colibris: full-width-editor fix padding property which was overwritten
2020-04-19 03:03:44 +02:00
22f7e1fd36
colibris: small improvement on chat and sidediv
2020-04-19 03:03:44 +02:00
b06324ad80
css: improve gritters
...
- have two containers, one of the top, on of the bottom;
- remove gritting chat message when opening the chat.
2020-04-19 03:03:44 +02:00
3e12b6d132
chat: fix coloring with dark background, and scrolling chattext when new message come in
2020-04-19 03:03:44 +02:00
780eaad573
no-skin: fix toolbar icons position
2020-04-19 03:03:44 +02:00
705b6c5e2e
colibris: adds toolbar border when editor is scrolling
2020-04-19 03:03:44 +02:00
f650d3a35a
colibris: fixs skin variants background
2020-04-19 03:03:44 +02:00
e2e5c7695b
colibris: Fix skin variant builder after introducing nice-select
2020-04-19 03:03:44 +02:00
621448b92f
css: add default color/variable for browsers non supporting css variables
2020-04-19 03:03:44 +02:00
6de996c973
css: various improvements
2020-04-19 03:03:44 +02:00
02769bee44
css: simplify new theme and variants
...
make design simpler so it's less complex to implement
remove light-soft-color and dark-soft-color
2020-04-19 03:03:44 +02:00
ca12287a26
pad_editor: fix manage show authorship on both pad and chat
2020-04-19 03:03:44 +02:00
c5fdc6129e
colibris: adjust commented text color
2020-04-19 03:03:44 +02:00
2193875292
colibris: fix coloring text when authorship background color is activated #3641
2020-04-19 03:03:44 +02:00
5e6ceb071e
prevent sticky chat and chatAndUsers for mobile
2020-04-19 03:03:44 +02:00
c945c57a87
css: use default cursor
2020-04-19 03:03:44 +02:00
8a4de6c366
css: fix comment style
2020-04-19 03:03:44 +02:00
0cbd178f95
css: small fixes
2020-04-19 03:03:44 +02:00
8b6cfba639
css: simplify input coloring
2020-04-19 03:03:44 +02:00
12da4f751f
colibris: style ep_comments
2020-04-19 03:03:44 +02:00
ce1e9672f9
css: style select with nice-select library
2020-04-19 03:03:44 +02:00
21de2bf4a0
css: fix default skin after all the changes made to Colibris
2020-04-19 03:03:44 +02:00
7fb086edbe
css: Still some adjustements to handle all variants properly
2020-04-19 03:03:44 +02:00
c6f5ced23c
css: adds UI skin variants builder (only for colibris skin)
2020-04-19 03:03:44 +02:00
cbc6304243
css: add chat animation on opening
2020-04-19 03:03:44 +02:00
f5685f45c7
css: various improvements
2020-04-19 03:03:44 +02:00
709e5d2233
colibris: introduce skin variants, in order to customize the rendering
...
This provide a nice way to change the colors of main containers from settings file. See comment inside settings for how it works
2020-04-19 03:03:44 +02:00
913d5fd0d9
colibris: Improve table of content
...
Display it on the left to balance with comments and chat and user that can go on the right
2020-04-19 03:03:44 +02:00
99d9752b0a
css: introduce css variables in Colibris skin
2020-04-19 03:03:44 +02:00
a89503a4dd
css: style scroll bars
2020-04-19 03:03:44 +02:00
71a3579ae7
css: fix broken popup colorpicker chatAndUsers
2020-04-19 03:03:44 +02:00
eb0d8839c2
css: minor improvements
2020-04-19 03:03:44 +02:00
281b7a2ab0
css: style checkboxes
2020-04-19 03:03:44 +02:00
9497db89c9
css: fix popup broken by new animation
...
fix connectivity
fix chat and users
2020-04-19 03:03:44 +02:00
9b60bb4d55
gritter: Improve animations
...
fix recently introduced bug by myself where all gritter were removed when first removed.
Display container at the top
2020-04-19 03:03:44 +02:00
559a48221e
css: Clear old comments code, we gonna write it from scratch
2020-04-19 03:03:44 +02:00
6a5c35b651
css: layout, restrict innerdoc width instead of outerdoc width
2020-04-19 03:03:44 +02:00
51b857ad1a
css: minor improvements
2020-04-19 03:03:44 +02:00
John McLear