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

6412 commits

This branch
This branch
All branches
Author SHA1 Message Date
webzwo0i
b760e699c6 remove explicitly setting process.env.DEBUG 2020-12-24 08:46:25 +00:00
Richard Hansen
88f0310071 Merge branch 'master' into develop 2020-12-23 17:04:46 -05:00
Richard Hansen
01a763e15e Merge branch 'develop' into master 2020-12-23 17:03:33 -05:00
Richard Hansen
9a15af78b6 Regenerate src/package-lock.json with npm v6.14.9 
This reverts the file back to lockfileVersion 1, which is used by the
LTS version of npm.
 2020-12-23 16:58:30 -05:00
Richard Hansen
f773193f3c Merge branch 'master' into develop 2020-12-23 16:44:16 -05:00
John McLear
4671b275e9 script: various fixes to release script 2020-12-23 16:27:02 -05:00
Richard Hansen
020f5ff730 Merge branch 'develop' into master 2020-12-23 16:21:00 -05:00
John McLear
d9262fccbd bump version 2020-12-23 16:18:28 -05:00
John McLear
b59461a469 script: include package files in release script logic 2020-12-23 16:18:28 -05:00
John McLear
89ae726221 script: close console log in release script... 2020-12-23 16:18:28 -05:00
John McLear
ece7fd896c scripts: A script to create an Etherpad release (#4538) 2020-12-23 16:18:28 -05:00
John McLear
998c80607e changelog: updated changelog 2020-12-23 16:18:28 -05:00
John McLear
1a845773ee css: loading position box 2020-12-23 16:18:28 -05:00
Richard Hansen
f31232dd20 socket.io: Disconnect clients when closing HTTP server 2020-12-23 16:18:28 -05:00
Richard Hansen
9f7d42185d socket.io: Reconnect if the server disconnects 
This will make the pages gracefully handle HTTP server restart events,
which happen whenever a plugin is installed or uninstalled via the
`/admin/plugins` page.
 2020-12-23 16:18:28 -05:00
Richard Hansen
303964c51e socket.io: Factor out client connection logic 2020-12-23 16:18:28 -05:00
Richard Hansen
7eb0f996c3 socket.io: Delete ignored resource option 
I couldn't find any reference to a `resource` option in either the
socket.io-client documentation or its source code.
 2020-12-23 16:18:28 -05:00
Richard Hansen
7949219179 Reformat src/ep.json 2020-12-23 16:18:28 -05:00
Richard Hansen
8c1afc3399 express: New expressCloseServer hook 
This will be used by a future commit to close all socket.io
connections during server restart.
 2020-12-23 16:18:28 -05:00
Richard Hansen
3e8c3e5789 express: Factor out common server shutdown logic 
Also log when the HTTP server is about to be closed and when it is
done closing.
 2020-12-23 16:18:28 -05:00
Richard Hansen
ff19181cd1 lint: Fix some straightforward ESLint errors 2020-12-23 16:18:28 -05:00
translatewiki.net
ac086c7925 Localisation updates from https://translatewiki.net. 2020-12-23 16:18:28 -05:00
webzwo0i
790ba72a9e change scroll-behavior to auto 
timeslider follow test: ensure there are so much lines in the pad view
below the changed line, so that the changed line will be the first
visible line
 2020-12-23 16:18:28 -05:00
John McLear
996a2d86dd lint: chat (#4573) 
Co-authored-by: Richard Hansen <rhansen@rhansen.org>
 2020-12-23 16:18:28 -05:00
John McLear
8bf463fb00 lint: broadcast_revisions (#4571) 
Co-authored-by: Richard Hansen <rhansen@rhansen.org>
 2020-12-23 16:17:59 -05:00
John McLear
4aef15cb11
lint: collab-client (#4574) 
* lint: collab-client

* Undo incorrect lint fixes

These will be re-fixed in a future commit.

* Properly fix guard-for-in error

* Properly fix prefer-rest-params errors

* Move some code back to where it was

Moving the code makes it hard to review the diff.

* Delete DISCONNECT_REASON case

Someone reading the code won't understand what "used to handle
appLevelDisconnectReason" means until they dig through the Git
history. Given the server never sends messages of type
DISCONNECT_REASON anyway, just delete the case.

* Refine lint fixes

Co-authored-by: Richard Hansen <rhansen@rhansen.org>
 2020-12-21 20:19:00 +00:00
Richard Hansen
d34a70c940 Delete merge conflict marker 
This fixes a bug introduced in commit
040057239e.
 2020-12-20 18:32:30 -05:00
Hossein Marzban
170a230c3a
Lint: timeslider (#4580) 
Squashed changes from rhansen@rhansen.org:
  * Move code back to where it was. (It's easier to review changes
    when the code isn't moved. This causes some no-use-before-define
    warnings to reappear, but those are just warnings.)
  * Move eslint-disable comment to same line
  * Use `window.clientvars` to resolve no-global-assign
  * Undo changes that aren't about fixing lint errors
 2020-12-20 18:24:17 -05:00
John McLear
bca60c8b17 lazydeveloper: remove console log 2020-12-20 10:56:19 +00:00
John McLear
e18b9d1844 timeslider/bugfix: timeslider wasn't updating when new pad contents was created - #4595 2020-12-20 10:45:16 +00:00
John McLear
0362d3b05d
lint: pad prefix files (#4577) 
* lint: pad_connectionstatus

* lint: pad_utils

* lint: pad_userlist.js -- still WIP

* shift underscore not to be in require but to be used from window

* lint: pad_modals

* pad_impexp.js

* lint: more errors done

* lint: auto reconn

* lint: pad_editor

* lint: finish auto reconn

* lint: imp exp rework

* lint: import

* lint: pad.js nearly done but pizza here...

* lint: clientVars global query

* put clientVars in window

* Revert incorrect lint fixes

* Properly fix guard-for-in lint errors

* Properly fix no-unused-vars error regarding `gritter`

* Refine lint fixes

Co-authored-by: Richard Hansen <rhansen@rhansen.org>
 2020-12-20 07:15:58 +00:00
Hossein Marzban
34ee77993f
Lint: pluginfw tsort.js (#4576) 
* lint: pluginfw tsort.js

* Don't comment out the `console.log()` call

Disabling the log message is out of scope for the pull request.

* Put const and let on separate lines

* Convert `tsort` from function to arrow function

ESLint doesn't complain about this due to a bug in
prefer-arrow/prefer-arrow-functions rule:
https://github.com/TristonJ/eslint-plugin-prefer-arrow/issues/24

Co-authored-by: Richard Hansen <rhansen@rhansen.org>
 2020-12-20 06:18:49 +00:00
webzwo0i
040057239e
tests for spaces (#4594) 2020-12-20 06:18:19 +00:00
webzwo0i
a637920e55
add list-style:none for ul.indents in exported HTML (#4586) 
* add list-style:none for ul.indents in exported HTML

* use list-style-type not list-style
 2020-12-20 06:00:18 +00:00
Richard Hansen
b82bf5c726 Drop support for Internet Explorer 2020-12-19 19:13:31 +00:00
webzwo0i
c5cf7ab144
tests: Ignore head tag on import / improved contentcollector tests 
* fix accidental write to global variable
properly show pending tests
log test name in suite
better log output for received/expected strings

* cc tests: enable second nestedOL test

* ignore the head tag on import
 2020-12-18 09:37:37 +00:00
webzwo0i
5673a76b38 cc tests: enable second nestedOL test 2020-12-18 09:30:18 +00:00
webzwo0i
c989a8e279 fix accidental write to global variable 
properly show pending tests
log test name in suite
better log output for received/expected strings
 2020-12-18 09:30:18 +00:00
Richard Hansen
d9b7aa489d pad import/export: Delete dead functions 2020-12-18 09:29:28 +00:00
Richard Hansen
7e50fc2ab5 Delete dead SERVER_MESSAGE and guest handling code 
None of this code seems to be reachable. Hopefully no plugins expect
it to exist.
 2020-12-18 09:29:28 +00:00
Richard Hansen
794dfb1863 lint: Bump eslint-config-etherpad and install its new deps 2020-12-17 22:18:29 +00:00
translatewiki.net
c9db9500e5 Localisation updates from https://translatewiki.net. 2020-12-17 15:13:17 +01:00
Richard Hansen
f54dcbc766 lint: Re-run eslint --fix 2020-12-16 22:09:48 +00:00
Richard Hansen
fc234d0088 lint: Bump eslint and eslint-config-etherpad versions 2020-12-16 22:09:48 +00:00
John McLear
8bee2e41f4
docs: update Node version to 14 which is LTS 2020-12-16 19:50:21 +00:00
Richard Hansen
af7cd13787 pad: Add a hook for the permission denied block 
This makes it possible for the ep_readonly_guest plugin to add a login
button.
 2020-12-16 19:39:52 +00:00
Richard Hansen
92b295193f css: Apply font formatting to the text, not the high-level div 
This makes it possible for plugins to add new items without them
rendering centered, at a ridiculous size, or at an awkward location.
 2020-12-16 19:39:52 +00:00
Richard Hansen
27dab35827 css: Delete absolute line-height 
Having an absolute `line-height` causes problems when something sets
`font-size` without also setting `line-height`.
 2020-12-16 19:39:52 +00:00
John McLear
92e36b82b5
linting: pad_editbar.js 2020-12-16 12:12:25 +00:00
Hossein Marzban
6f309ac20a
lint: pluginfw/client_plugins (#4572) 2020-12-15 21:40:41 -05:00