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-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity
7033 commits 207 branches 105 tags 124 MiB
Commit graph

7033 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
e73a4e79f6 Update collaboration.yml 2021-03-14 09:51:49 +00:00
John McLear
76469fff8f Update collaboration.yml 2021-03-14 09:47:30 +00:00
John McLear
96032ad361 timeouts 2021-03-14 09:37:05 +00:00
John McLear
622a2be177 why is video so slow? 2021-03-14 09:25:21 +00:00
John McLear
cbf2a5898c Update collaborate.js 2021-03-14 09:06:13 +00:00
John McLear
6a1b2005bd Basis for test, no actual assertion yet for UX 2021-03-14 08:45:40 +00:00
John McLear
3f2c1ae1dd Update collaborate.js 2021-03-13 21:10:48 +00:00
John McLear
1f141710f5 Update collaboration.yml 2021-03-13 20:53:19 +00:00
John McLear
e6600d45e4 cache node_modules maybe? 2021-03-13 20:34:09 +00:00
John McLear
c63c621722 Update collaboration.yml 2021-03-13 20:28:18 +00:00
John McLear
6a57717236 test to see if wait is required 2021-03-13 20:19:34 +00:00
John McLear
72c41c228f Update collaborate.js 2021-03-13 19:56:17 +00:00
John McLear
a549ca07ab parallel? 2021-03-13 19:38:23 +00:00
John McLear
bc1baeb2fe Update collaboration.yml 2021-03-13 19:36:49 +00:00
John McLear
1581b713b9 Update collaboration.yml 2021-03-13 19:24:01 +00:00
John McLear
04e275ea15 Update collaboration.yml 2021-03-13 19:12:54 +00:00
John McLear
af42e3e620 Update collaboration.yml 2021-03-13 18:57:16 +00:00
John McLear
878af5ee0a Update collaboration.yml 2021-03-13 18:51:06 +00:00
John McLear
51a8f0db22 Update collaboration.yml 2021-03-13 18:27:59 +00:00
John McLear
ee41ca7807 Update collaborate.js 2021-03-13 17:19:21 +00:00
John McLear
cc4253bf3f Update collaboration.yml 2021-03-13 16:54:30 +00:00
John McLear
89a661b448 tests: test to see if I can have multiple cypress clients collaborating at once 2021-03-13 16:46:14 +00:00
John McLear
92a42520ee tests: scrap buggy and non-functional responsiveness test 2021-03-13 16:45:49 +00:00
webzwo0i
6f591b5c77
add class pad to timeslider to fix height issue (#4941) 2021-03-12 21:16:22 -05:00
webzwo0i
8e2a21ec84
arrow functions dont have arguments (#4943) 2021-03-12 14:25:14 -05:00
Richard Hansen
0b9bf4a78e deps: Update ueberdb2 to get updated metrics 2021-03-11 20:21:38 +00:00
Richard Hansen
9b82d1d37d server: Log stats (metrics) on fatal error 
This might help users troubleshoot rare crashes.
 2021-03-11 07:38:44 +00:00
Richard Hansen
d2610284ad bin/safeRun.sh: Fix try: not found bug 
This fixes a copy+paste bug introduced in commit
8b28e00784 (v1.8.8).
 2021-03-10 02:54:20 -05:00
John McLear
9bc3ac0957 Include shard.etherpad.com in the README 2021-03-09 18:10:49 +00:00
Richard Hansen
fcf43a7089 stats: Expose ueberDB metrics 2021-03-08 22:32:39 +00:00
Richard Hansen
71dfa7070d deps: Update ueberdb2 to get metrics 2021-03-08 22:32:39 +00:00
Richard Hansen
926f0fcefb CSS: Increase size of contenteditable area 2021-03-08 14:39:18 +00:00
Richard Hansen
404486069c ace: Build the outer and inner iframes programmatically 
This makes the code easier to read and it silences Chrome's
`document.write()` warning:
https://developers.google.com/web/updates/2016/08/removing-document-write

This is a redo of commit a17f9bf3cf,
which was reverted in commit 912f0f195f
due to a CSS bug.
 2021-03-05 19:31:59 +00:00
webzwo0i
4ca989a255
sessions: add more endpoints that do not need a session (#4921) 
* add more endpoints that do not need a session

* Update src/node/hooks/express/webaccess.js

Co-authored-by: Richard Hansen <rhansen@rhansen.org>

* Update src/node/hooks/express/webaccess.js

Co-authored-by: Richard Hansen <rhansen@rhansen.org>

Co-authored-by: John McLear <john@mclear.co.uk>
Co-authored-by: Richard Hansen <rhansen@rhansen.org>
 2021-03-05 07:48:33 +00:00
Richard Hansen
60da2373a6 CSS: Add comment to no-skin/pad.css to silence warning 
Firefox prints "Style sheet could not be loaded" if the file is empty.
 2021-03-05 07:45:48 +00:00
Richard Hansen
5546cc5e7b CSS: Delete bogus <link> tag 
Browsers report an error with this tag. Strangely, this tag has
existed since Etherpad's very first commit.
 2021-03-05 07:45:48 +00:00
Richard Hansen
470f40d7db CSS: Use auto for iframe body height 
This change makes no visual difference right now, but will matter (for
reasons I don't understand) once we change `ace.js` to build the
iframes by constructing elements in JavaScript (vs. writing HTML).
 2021-03-05 07:45:48 +00:00
Richard Hansen
48e1d1c23f CSS: Fix class name for outer iframe <html> tag 
* Add the class "pad" to the `<html>` tag in `pad.html` (the outer
    iframe's parent).
  * Change the CSS selector that refers to the `<html>` tag in
    `pad.html` from `html:not(.inner-editor)` to `html.pad`.
  * Change the class name of the outer iframe's `<html>` tag from
    "inner-editor" to "outer-editor".
  * Update CSS rules to use the new class name.
 2021-03-05 07:45:48 +00:00
John McLear
6615d36f8d
Merge branch 'master' into develop 2021-03-05 07:28:48 +00:00
John McLear
b99c2cae22
Merge branch 'develop' 2021-03-05 07:28:47 +00:00
John McLear
de394f72a6
bump version 2021-03-05 07:28:44 +00:00
John McLear
dabb4917ed
changelog 1.8.12 2021-03-05 07:27:31 +00:00
John McLear
5ac90ab30f tests: Allow time for minification to complete 
Minification happens after the initial visit and request to pages.
 2021-03-05 07:11:42 +00:00
John McLear
536db7553f
tests: CI of updating from master > this commit. (#4912) 
* tests: CI of updating from master > this commit.

In response to cypress eslint I thought I'd put some CI testing for if a PR might break automated upgrading.

Matrix usage is probably overkill.

* Update major-version-git-pull-update.yml

* Name...

* include a front end test

* fix pathing

* Clarity on what's happening

* Update .github/workflows/major-version-git-pull-update.yml

Co-authored-by: Richard Hansen <rhansen@rhansen.org>

* Update .github/workflows/major-version-git-pull-update.yml

Co-authored-by: Richard Hansen <rhansen@rhansen.org>

* Update .github/workflows/major-version-git-pull-update.yml

Co-authored-by: Richard Hansen <rhansen@rhansen.org>

Co-authored-by: Richard Hansen <rhansen@rhansen.org>
 2021-03-05 06:38:50 +00:00
snyk-bot
d0e257d8df fix: upgrade resolve from 1.19.0 to 1.20.0 
Snyk has created this PR to upgrade resolve from 1.19.0 to 1.20.0.

See this package in npm:
https://www.npmjs.com/package/resolve

See this project in Snyk:
https://app.snyk.io/org/johnmclear/project/d9a12bfb-7ccd-443f-9e22-f30d339cc8c5?utm_source=github&utm_medium=upgrade-pr
 2021-03-05 06:37:45 +00:00
Richard Hansen
eccec0ba0a Docker: Invoke npm only once when installing plugins 
This speeds up the build process.
 2021-03-04 19:07:03 +00:00
Richard Hansen
c07bfe10bd Docker: Add arg for the Etherpad directory 
This makes it possible for users to match the directory inside the
container to the host system (for convenience or to avoid confusion).
 2021-03-04 19:07:03 +00:00
Richard Hansen
34d9069874 Docker: Add args for the etherpad user's home, UID, GID, and shell 
Now one can create an `etherpad` user and group on the host system and
set the container's UID and GID to match:

    adduser --system --group etherpad &&
    uid=$(id -u etherpad) &&
    gid=$(id -g etherpad) &&
    docker build --build-arg EP_UID="${uid}" --build-arg EP_GID="${gid}" .

This ensures that files created by user `etherpad` inside the
container are owned by user `etherpad` outside the container.
 2021-03-04 19:07:03 +00:00
translatewiki.net
21cdf0edaa Localisation updates from https://translatewiki.net. 2021-03-04 13:58:49 +01:00
Richard Hansen
912f0f195f Revert "ace: Build the outer and inner iframes programmatically" 
This reverts commit a17f9bf3cf, which
caused a mysterious bug with the line numbers. Revert to avoid
blocking a new release while I figure out the bug.
 2021-03-04 02:05:54 +00:00