mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-31 19:02:59 +01:00
Merge branch 'develop'
This commit is contained in:
commit
4631e145b2
6 changed files with 13 additions and 13 deletions
|
@ -107,12 +107,5 @@ jobs:
|
||||||
# For pull requests, ${GITHUB_SHA} is the automatically generated merge
|
# For pull requests, ${GITHUB_SHA} is the automatically generated merge
|
||||||
# commit that merges the PR's source branch to its destination branch.
|
# commit that merges the PR's source branch to its destination branch.
|
||||||
run: git checkout "${GITHUB_SHA}"
|
run: git checkout "${GITHUB_SHA}"
|
||||||
|
- name: Run the backend tests
|
||||||
-
|
run: pnpm run test
|
||||||
name: Install all dependencies and symlink for ep_etherpad-lite
|
|
||||||
run: bin/installDeps.sh
|
|
||||||
-
|
|
||||||
name: Run Etherpad & Test Frontend
|
|
||||||
working-directory: ./src
|
|
||||||
run: |
|
|
||||||
pnpm run test-ui --project=chromium
|
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
# 2.0.1
|
||||||
|
|
||||||
|
### Notable enhancements and fixes
|
||||||
|
|
||||||
|
- Fixed a bug where a plugin depending on a scoped dependency would not install successfully.
|
||||||
|
|
||||||
|
|
||||||
# 2.0.0
|
# 2.0.0
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "admin",
|
"name": "admin",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "2.0.0",
|
"version": "2.0.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "bin",
|
"name": "bin",
|
||||||
"version": "2.0.0",
|
"version": "2.0.1",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "checkAllPads.js",
|
"main": "checkAllPads.js",
|
||||||
"directories": {
|
"directories": {
|
||||||
|
|
|
@ -41,6 +41,6 @@
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/ether/etherpad-lite.git"
|
"url": "https://github.com/ether/etherpad-lite.git"
|
||||||
},
|
},
|
||||||
"version": "2.0.0",
|
"version": "2.0.1",
|
||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,6 +125,6 @@
|
||||||
"test-admin": "npx playwright test tests/frontend-new/admin-spec --workers 1",
|
"test-admin": "npx playwright test tests/frontend-new/admin-spec --workers 1",
|
||||||
"test-admin:ui": "npx playwright test tests/frontend-new/admin-spec --ui --workers 1"
|
"test-admin:ui": "npx playwright test tests/frontend-new/admin-spec --ui --workers 1"
|
||||||
},
|
},
|
||||||
"version": "2.0.0",
|
"version": "2.0.1",
|
||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue