Commit Graph

6846 Commits (3b5b996d846ede758cb33b818f975a95184a4bbb)

Author SHA1 Message Date
John McLear 3b5b996d84 lint: Changeset no var 2021-02-21 11:05:25 +00:00
John McLear 0b78ad2f90 lint: Changeset.js curly braces in correct position 2021-02-21 11:05:25 +00:00
John McLear 23d7544763 lint: Changeset.js max-len 2021-02-21 11:05:25 +00:00
John McLear 98a0e76a20 lint: Changeset.js opcode eqeqeq checks 2021-02-21 11:05:25 +00:00
John McLear d91f2b5b07 lint: Changeset.js additional arrow functions 2021-02-21 11:05:25 +00:00
John McLear acccf56724 lint: Changeset.js arrow-functions 2021-02-21 11:05:25 +00:00
John McLear cf37f52093 lint: collab_client.js 2021-02-21 11:05:25 +00:00
John McLear b029edb931 lint: index.js 2021-02-21 11:05:25 +00:00
John McLear 01dd004054 lint: ChangesetUtils 2021-02-21 11:05:25 +00:00
John McLear 7c51446040 lint: use strict 2021-02-21 11:05:25 +00:00
John McLear c64b1b8ead lint: skins 2021-02-21 11:05:25 +00:00
Sebastian Castro 4ca2d7ea3a
include lineHeight property in sidebar elements (#4831)
This also makes the full line number element clickable to ensure a positive UX for the ``?lineNumber`` URL endpoint.  It also makes it more obvious that a click action can happen based on the hover.

Make line numbers stick to baseline of first line of wrapped content and editor lines with increased line hieght.

Make it compatible with ep_author_neat
2021-02-20 13:24:17 +00:00
John McLear 08d2024caf
docs: badges
Badges into the README.md to show code quality, engagement etc.
2021-02-20 13:22:23 +00:00
John McLear 7e86acad8f
CI: Build and test Windows .zip (#4828) 2021-02-20 04:13:44 -05:00
Richard Hansen 4d50813c94
issue templates: Ask for server info when opening a bug 2021-02-19 02:51:15 -05:00
snyk-bot d5997ddf05 fix: upgrade log4js from 0.6.35 to 0.6.38
Snyk has created this PR to upgrade log4js from 0.6.35 to 0.6.38.

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

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 21:13:08 +00:00
Richard Hansen 6163339c0d plugins: Always install plugins with `--no-save`
The npm CLI can get confused if `package.json` or `package-lock.json`
exist.
2021-02-18 19:18:59 +00:00
Richard Hansen b3b5af3c3c plugins: Use `npm` CLI to install/uninstall plugins
Using npm as a module has long been discouraged and will stop working
with npm v7.
2021-02-18 19:18:59 +00:00
Richard Hansen 9633b98f92 tests: Delete unnecessary use of `npm` package 2021-02-18 19:18:59 +00:00
Richard Hansen 1cfbf88f7c run_cmd: Enhance with ability to return stdout as string 2021-02-18 19:18:59 +00:00
Richard Hansen d8bb5aa009 plugins: Eliminate unnecessary `run_npm.js`
I had anticipated more shared logic than we actually need (the
abstraction in `run_npm.js` is YAGNI).
2021-02-18 19:18:59 +00:00
Richard Hansen 426c025127 run_cmd: Log to Etherpad logs by default 2021-02-18 19:18:59 +00:00
Richard Hansen 689a75b381 plugins: Pass `--no-production` instead of setting `NODE_ENV=development` 2021-02-18 19:18:59 +00:00
Richard Hansen dcf7891316 plugins: Improve logging of plugin events
This will make it easier to troubleshoot plugin and npm issues.
2021-02-18 19:18:59 +00:00
Richard Hansen 4253a2ea8f plugins: Move hook call and plugin update out of try block
Exceptions thrown by these function calls are serious and should crash
Etherpad.
2021-02-18 19:18:59 +00:00
Richard Hansen a8479e4a0e lint: Fix some ESLint errors in pluginfw 2021-02-18 19:18:59 +00:00
Richard Hansen a45e85a730 Use `settings.root` to anchor pathnames 2021-02-18 19:18:59 +00:00
Richard Hansen f868788417 Remove unnecessary `path.normalize()` calls
`path.join()` already normalizes.
2021-02-18 19:18:59 +00:00
Richard Hansen 84c1d74f8b server: Fix Gate constructor
The ECMAScript spec for `.then()` requires Promise subclass
constructors to take an executor.
2021-02-18 19:18:34 +00:00
Richard Hansen 4c6cb53d18 server: Improve log messages when exiting 2021-02-18 19:18:34 +00:00
snyk-bot 449b03d7e8 fix: upgrade unorm from 1.4.1 to 1.6.0
Snyk has created this PR to upgrade unorm from 1.4.1 to 1.6.0.

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

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 19:18:19 +00:00
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