mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 16:36:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
5774 commits 213 branches 107 tags 72 MiB
Commit graph

3175 commits

Author SHA1 Message Date
Chocobozzz
6cb78e51b0 pad.js: wait write callback instead of buffer callback 2020-04-26 04:14:19 +02:00
Chocobozzz
53003d4471 pad.js: fix freeze on pad deletion when it has many revisions 2020-04-26 04:14:19 +02:00
John McLear
09ddfb9e20 pad_impexp: close modal on succesful import 2020-04-21 15:03:09 +00:00
John McLear
de09b9a410 ace2_inner: reformatting, no functional changes 2020-04-21 15:02:58 +00:00
John McLear
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
Luke Williams
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
Sebastian Castro
e8cd83286d
css: fix timeslider toolbar on mobile when multiple authors are displayed (#3933) 2020-04-24 20:56:30 +01:00
muxator
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
muxator
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
Sebastian Castro
789dd7acd6 skin builder: add coma at the end of the generated code 
Closes #3919
 2020-04-22 22:02:25 +02:00
John McLear
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
John McLear
c6cb253f76 ImportHandler: UI for showing maxFileSize error on import 
This commit is an integration to f4418149cb.
 2020-04-14 10:02:21 +00:00
John McLear
53d8e32ecb messages: "install AbiWord" -> "install AbiWord or LibreOffice" 2020-04-14 09:43:21 +00:00
John McLear
ffa7244e81 ace2_inner: close all gritters when hitting escape key 2020-04-22 01:51:59 +02:00
Sebastian Castro
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
Luke Williams
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
Sebastian Castro
cb785590bc
css: some fix for browser compatibility refs #3907 (#3913) 2020-04-21 14:33:53 +01:00
muxator
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
translatewiki.net
68ff6d497d Localisation updates from https://translatewiki.net. 2020-04-20 16:52:37 +02:00
Sebastian Castro
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
Sebastian Castro
4ceb42603e
css: Fixes #3900 innerdocbodyu Layout broken for safari (#3906) and other browsers 2020-04-20 09:47:52 +01:00
Gabriel Augusto Almeida
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
John McLear
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
Sebastian Castro
70990afd66 Change favicon to be closer to new style 2020-04-19 18:20:21 +02:00
muxator
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
muxator
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
muxator
be3d158402 pad.html: use TLS for the "Powered by" link: http://etherpad.org -> https://etherpad.org 2020-04-19 03:24:47 +02:00
Sebastian Castro
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
Sebastian Castro
4593c4be7c users: remove hardcoded color for editempty. Use opacity instead 2020-04-19 03:03:44 +02:00
Sebastian Castro
cbd9378908 colibris: full-width-editor fix padding property which was overwritten 2020-04-19 03:03:44 +02:00
Sebastian Castro
22f7e1fd36 colibris: small improvement on chat and sidediv 2020-04-19 03:03:44 +02:00
Sebastian Castro
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
Sebastian Castro
3e12b6d132 chat: fix coloring with dark background, and scrolling chattext when new message come in 2020-04-19 03:03:44 +02:00
Sebastian Castro
780eaad573 no-skin: fix toolbar icons position 2020-04-19 03:03:44 +02:00
Sebastian Castro
705b6c5e2e colibris: adds toolbar border when editor is scrolling 2020-04-19 03:03:44 +02:00
Sebastian Castro
f650d3a35a colibris: fixs skin variants background 2020-04-19 03:03:44 +02:00
Sebastian Castro
e2e5c7695b colibris: Fix skin variant builder after introducing nice-select 2020-04-19 03:03:44 +02:00
Sebastian Castro
621448b92f css: add default color/variable for browsers non supporting css variables 2020-04-19 03:03:44 +02:00
Sebastian Castro
6de996c973 css: various improvements 2020-04-19 03:03:44 +02:00
Sebastian Castro
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
Sebastian Castro
ca12287a26 pad_editor: fix manage show authorship on both pad and chat 2020-04-19 03:03:44 +02:00
Sebastian Castro
c5fdc6129e colibris: adjust commented text color 2020-04-19 03:03:44 +02:00
Sebastian Castro
2193875292 colibris: fix coloring text when authorship background color is activated #3641 2020-04-19 03:03:44 +02:00
Sebastian Castro
5e6ceb071e prevent sticky chat and chatAndUsers for mobile 2020-04-19 03:03:44 +02:00
Sebastian Castro
c945c57a87 css: use default cursor 2020-04-19 03:03:44 +02:00
Sebastian Castro
8a4de6c366 css: fix comment style 2020-04-19 03:03:44 +02:00
Sebastian Castro
0cbd178f95 css: small fixes 2020-04-19 03:03:44 +02:00
Sebastian Castro
8b6cfba639 css: simplify input coloring 2020-04-19 03:03:44 +02:00
Sebastian Castro
12da4f751f colibris: style ep_comments 2020-04-19 03:03:44 +02:00
Sebastian Castro
ce1e9672f9 css: style select with nice-select library 2020-04-19 03:03:44 +02:00