libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-21 06:52:46 +01:00
Code Issues Projects Releases Wiki Activity
5937 commits 207 branches 105 tags 123 MiB
Commit graph

1108 commits

Author SHA1 Message Date
Florian Rittmeier
c7581ba6f3
fixes jQuery.Deferred exception as reported in #4132 (#4158) 2020-07-10 15:28:32 +01:00
John McLear
b15154cc23
Same site cookie fix - Ready for testing / merge (#3990) 
* initial fix for httpprefs

* token

* express_sid fix
 2020-07-10 08:43:20 +01:00
John McLear
a3386e3e55
Dont use jquery in import handler (#4153) 
I think jQ3 update broke imports a bit, so this removes jQuery and also ensures only .etherpad does reload of page.
 2020-07-08 14:50:48 +01:00
webzwo0i
b7dff552f0
cruft: Remove unecessary consolelogs (#4141) 2020-06-27 20:12:06 +01:00
John McLear
045ac70db8
pluginfw: Make the NEW_CHANGES payload include the message in handleClientMessage 2020-06-12 12:26:33 +01:00
John McLear
564e8fee07 forcing back to last known stable before parent merge 2020-06-07 18:44:01 +00:00
John McLear
009e1d01f7
staleCode: Async update 2020-06-07 14:56:45 +01:00
John McLear
128f3e15eb
stalecode: jQuery 3 (#3903) 2020-06-07 12:01:14 +01:00
John McLear
c5584fb5b4
editor: outdent on ol removal (#4088) 2020-06-07 09:51:12 +01:00
John McLear
2cd3dccc4d Revert "Revert "Revert "editor: ul/ol/li - outdent on ol and ul button press""" 
This reverts commit fd3980133d.
 2020-06-06 20:51:17 +00:00
John McLear
fd3980133d Revert "Revert "editor: ul/ol/li - outdent on ol and ul button press"" 
This reverts commit 82fb6ddc99.
 2020-06-06 20:38:08 +00:00
John McLear
82fb6ddc99 Revert "editor: ul/ol/li - outdent on ol and ul button press" 
This reverts commit fc88f12bba.
 2020-06-06 18:34:51 +00:00
John McLear
56f6973209
import/export: Timeslider export links numeric pad IDs (#4073) 
Fixes #4071
 2020-06-05 22:50:55 +01:00
John McLear
6dbfe5e43c
editor/ux: Clearauthorship on full doc selected 2020-06-05 22:47:12 +01:00
John McLear
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
John McLear
fc88f12bba
editor: ul/ol/li - outdent on ol and ul button press 2020-06-05 20:00:21 +01:00
John McLear
13bd859f31
Import/export: Fix3032 - importing document botches pad options (#3769) 
Fixes #3032
 2020-06-05 19:58:25 +01:00
Sebastian Castro
7aa7e02e27
Various UI improvement (#4017) 2020-06-02 10:25:43 +01:00
Alex
f45d85f615
editor: fix the wrong URL when we use etherpad without /p/ in the URL (#4070) 2020-06-01 22:12:42 +01:00
John McLear
0d51e71578
ux: Better ux for if cookies are disabled or not available. 2020-06-01 20:17:48 +01:00
John McLear
bfca481b0b
import: setting for allowing import without author existing 2020-06-01 18:19:06 +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
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
40f36d7eb5
Tests: ShowChat fix (#4049) 
Resolves https://github.com/ether/etherpad-lite/issues/3541
 2020-05-28 15:18:13 +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
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
Sebastian Castro
4c8f60634e ui: use gritter to display error messages nicely (instead of loading box) 2020-05-15 01:08:40 +02:00
Alex
fda0d2884e iframe attribute: move quote 2020-05-13 18:51:09 +02:00
Sebastian Castro
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
Sebastian Castro
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
Sebastian Castro
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
Sebastian Castro
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
Sebastian Castro
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
Sebastian Castro
23307d14d5 share: change default iframe size, and remove border 
From 600*400 to 100%*600
 2020-05-03 22:36:14 +02:00
John McLear
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
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
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
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
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
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
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
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