libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,815 Commits 2 Branches 0 Tags 24 MiB
Commit Graph

6815 Commits

Author SHA1 Message Date
John McLear 9fb2c640b9
tests: Microsoft Windows Server CI (#4791) 
Due to a recent release that wasn't functioning properly this CI will help us catch the majority of Microsoft Node Quirks before they make it into a release.
 2021-02-18 18:49:43 +00:00
John McLear 13e4451c2b
Merge branch 'master' into develop 2021-02-18 14:37:08 +00:00
John McLear 65867eb895
Merge branch 'develop' 2021-02-18 14:37:06 +00:00
John McLear 9f317f0798
bump version 2021-02-18 14:37:02 +00:00
snyk-bot 19bf97bd2d fix: upgrade formidable from 1.2.1 to 1.2.2 
Snyk has created this PR to upgrade formidable from 1.2.1 to 1.2.2.

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

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-02-18 14:02:56 +00:00
snyk-bot a380fc2abf fix: upgrade tinycon from 0.0.1 to 0.6.8 
Snyk has created this PR to upgrade tinycon from 0.0.1 to 0.6.8.

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

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-02-18 13:45:18 +00:00
snyk-bot da65057bb1 fix: upgrade etherpad-yajsml from 0.0.2 to 0.0.4 
Snyk has created this PR to upgrade etherpad-yajsml from 0.0.2 to 0.0.4.

See this package in npm:
https://www.npmjs.com/package/etherpad-yajsml

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-02-18 04:33:40 -05:00
Ole Langbehn 24c1639f11
feat(docker): Add build var for optionally installing abiword (#4796) 
This MR introduces a docker build variable `INSTALL_ABIWORD`. When set
to any value other than `0`, ABIWORD is installed in the resulting
docker container, enabling the possibility to configure ABIWORD in
settings.json.docker or via ENV VAR `ABIWORD` for exporting to
DOC/PDF/ODT.

Documentation is included inline and in the docker markdown file.
 2021-02-18 04:27:52 -05:00
Richard Hansen 63e876f53d docs: Start CHANGELOG for 1.8.9 2021-02-18 03:56:41 -05:00
Richard Hansen 30dbdf29f4 import: Convert arrow function to regular function 
This fixes a bug introduced in commit
b711ff6acf. Some time between when that
commit was originally written and when it was merged a round of
linting had converted the function from a regular function to an arrow
function because `this` was never in the body of the function. When I
rebased the commit, which introduced `this` to the body, I didn't
catch the error.
 2021-02-18 03:42:56 -05:00
Richard Hansen fb745374c3 import: Improve error logging 2021-02-18 03:42:41 -05:00
Richard Hansen 22a67c5dc6 windows: Fix path to `server.js` in `start.bat` 2021-02-17 22:32:36 +00:00
John McLear 29f2cd34f0 build: fix build path for windows 2021-02-17 20:38:10 +00:00
Richard Hansen 8ef0860e8b
tests: Restore `runnerBackend.sh` (#4803) 
* tests: Restore `runnerBackend.sh`

`runnerBackend.sh` was deleted in commit
7dae5e3db8 but plugins still need it
until their GitHub workflow definitions have been updated.

Co-authored-by: John McLear <john@mclear.co.uk>
 2021-02-17 04:35:57 -05:00
Richard Hansen 7dae5e3db8 tests: Use the supertest agent from `common.js` for backend tests 2021-02-16 21:13:35 -05:00
Richard Hansen 5a91cf1b49 tests: Disable rate limiting for backend tests 2021-02-16 21:13:35 -05:00
Richard Hansen 4ae8fbc40d tests: Increase `importexportGetPost.js` timeouts 
The tests were timing out on my machine.
 2021-02-16 21:13:35 -05:00
Richard Hansen 3d2f77f75d lint: Fix ESLint errors in backend tests 2021-02-16 21:13:35 -05:00
Richard Hansen 00d45e3229 Defer rate limiter creation to a hook call 
This makes it possible to change the rate limiter settings via
`/admin/settings` or by modifying the appropriate settings object and
reinvoking the hook.
 2021-02-16 21:13:35 -05:00
Richard Hansen d7ed71eba0 plugins: Fix "Error: spawn npm ENOENT" error on Windows 
On Windows, npm should be invoked as `npm.cmd`, not `npm`. Use a
drop-in replacement for `child_process.spawn()` that does the right
thing on Windows.
 2021-02-16 22:00:20 +00:00
John McLear 2e92e8e9d0 tests: frontend test button increase timeouts 2021-02-16 16:38:59 +00:00
snyk-bot b06e47c06e fix: src/bin/doc/package.json & src/bin/doc/package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MARKED-584281
 2021-02-16 11:10:46 +00:00
snyk-bot 095edb5043 fix: upgrade express-rate-limit from 5.1.1 to 5.2.3 
Snyk has created this PR to upgrade express-rate-limit from 5.1.1 to 5.2.3.

See this package in npm:
https://www.npmjs.com/package/express-rate-limit

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-02-16 11:05:49 +00:00
Richard Hansen c39d0606cf ace2_inner: Delete special arrow key handling 
I can't see any reason this would be necessary, and it appears to not
behave as intended (`scroll.scrollWhenPressArrowKeys()` is not invoked
after a continuously held arrow key is finally let up).
 2021-02-16 11:03:31 +00:00
Richard Hansen 72704a9fbd release: Update the `doc/latest` symlink 2021-02-16 10:37:07 +00:00
Richard Hansen 345f5227fd release: Use log4js to improve message readability 2021-02-16 10:37:07 +00:00
Richard Hansen 899f2e02f3 release: Reset Git repo on error 2021-02-16 10:37:07 +00:00
Richard Hansen ba32f71f30 release: Automate more steps 2021-02-16 10:37:07 +00:00
Richard Hansen 18c8838a33 release: Stricter checking of `CHANGELOG.md` 2021-02-16 10:37:07 +00:00
Richard Hansen 5c48ebb406 release: Fix wrapping of log message 2021-02-16 10:37:07 +00:00
Richard Hansen 5816fd5f2f release: Add git sanity checks 2021-02-16 10:37:07 +00:00
Richard Hansen a814893ca3 release: Assume `../ether.github.com` exists 2021-02-16 10:37:07 +00:00
Richard Hansen 8db6b5da4a release: Don't capture stdout when unnecessary 
This should make it easier to troubleshoot issues.
 2021-02-16 10:37:07 +00:00
Richard Hansen 83b55eb41f release: Shorthand function for running a command 2021-02-16 10:37:07 +00:00
Richard Hansen 2691d556fe release: Enforce lockfileVersion 1 2021-02-16 10:37:07 +00:00
Richard Hansen 1ada0ab5d6 release: cd to Etherpad root directory 2021-02-16 10:37:07 +00:00
Richard Hansen 565d020876 release: Make sure JSON ends with `\n` 2021-02-16 10:37:07 +00:00
Richard Hansen ea4b2ef8fb release: Factor out JSON read/write for later reuse 2021-02-16 10:37:07 +00:00
Richard Hansen 8155d6154d release: Don't create `release/x.y.z` branch 
Patch-specific release branches should never diverge from the tag, so
they serve no useful purpose. (If they do diverge, which some did
before I deleted them all, what does it mean? Are we going to move the
tag in the future? It's just too confusing.)

In the future we might want to do major- or minor-specific
branches (e.g., `release/1` or `release/1.8`), but only if we want to
maintain old releases. For example, if 2.0 is a major release that
doesn't work with plugins designed for 1.x we might want to maintain a
`release/1` branch that continues to get bugfixes while the bulk of
new work continues to land on `develop`. If we do decide to maintain
old releases we'll need a new set of release scripts (or edit the
`release.js` script on the `release/1` branch).
 2021-02-16 10:37:07 +00:00
John McLear e1dcaa5210 release: Better steps for release procedure 2021-02-16 10:37:07 +00:00
John McLear 655ae90464 release: Exclude `var/` during Windows build 2021-02-16 10:37:07 +00:00
Richard Hansen d5969507cd release: Clone docs repo in `..` 2021-02-16 10:37:07 +00:00
Richard Hansen bdd32f8915 Replace `node_modules/ep_etherpad-lite` with `src` 2021-02-16 10:35:05 +00:00
snyk-bot 269c6d09c5 fix: upgrade npm from 6.14.8 to 6.14.11 
Snyk has created this PR to upgrade npm from 6.14.8 to 6.14.11.

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

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-02-15 18:35:59 -05:00
snyk-bot ed02606c4b
fix: upgrade semver from 5.6.0 to 5.7.1 
Snyk has created this PR to upgrade semver from 5.6.0 to 5.7.1.

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

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-02-15 21:54:50 +00:00
Richard Hansen f0a6236a0d Merge branch 'master' into develop 2021-02-15 12:47:47 -05:00
Richard Hansen 113df1f186 Merge branch 'develop' 2021-02-15 12:47:33 -05:00
John McLear c0f73e6672 bump version 2021-02-15 12:47:20 -05:00
John McLear 306e839bd8 docs: security notification 2021-02-15 12:45:31 -05:00
John McLear b7e88cb904 security: New setting for Socket.IO `maxHttpBufferSize` 2021-02-15 12:45:31 -05:00