pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-02-10 18:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/admin-panel2' into release/v9.1.0

Browse Source 
# Conflicts:
#	Common/sources/operationContext.js
#	Common/sources/utils.js
#	DocService/sources/DocsCoServer.js
#	DocService/sources/server.js
#	npm-shrinkwrap.json
#	package.json
This commit is contained in:
Sergey Konovalov
2025-09-05 02:41:00 +03:00
parent 58944cdef4 c189f8bd42
commit 1c4b8a1fab
74 changed files with 10618 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -15,6 +15,8 @@
"cross-env": "7.0.3",
"eslint": "9.16.0",
"eslint-config-prettier": "10.1.8",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.2.0",
"express": "4.21.2",
"globals": "15.12.0",
"husky": "8.0.3",
@ -42,6 +44,8 @@
"install:DocService": "npm ci --prefix ./DocService",
"install:FileConverter": "npm ci --prefix ./FileConverter",
"install:Metrics": "npm ci --prefix ./Metrics",
"install:AdminPanel/server": "npm ci --prefix ./AdminPanel/server",
"install:AdminPanel/client": "npm ci --prefix ./AdminPanel/client && npm --prefix ./AdminPanel/client run build",
"3d-party-lic-json:Common": "license-report --output=json --package=./Common/package.json --config ./3d-party-lic-report/license-report-config.json > ./3d-party-lic-report/license-report.json",
"3d-party-lic-json:DocService": "license-report --output=json --package=./DocService/package.json --config ./3d-party-lic-report/license-report-config.json > ./3d-party-lic-report/license-report.json",
"3d-party-lic-json:FileConverter": "license-report --output=json --package=./FileConverter/package.json --config ./3d-party-lic-report/license-report-config.json > ./3d-party-lic-report/license-report.json",