Commit Graph

6 Commits

Author SHA1 Message Date
d907fd088d [refactor] Fix admin panel statistics rendering in some info.json responses 2025-09-05 18:01:26 +03:00
1c4b8a1fab Merge branch 'feature/admin-panel2' into release/v9.1.0
# Conflicts:
#	Common/sources/operationContext.js
#	Common/sources/utils.js
#	DocService/sources/DocsCoServer.js
#	DocService/sources/server.js
#	npm-shrinkwrap.json
#	package.json
2025-09-05 02:41:00 +03:00
8a866dc61e [prettier] auto-fix 2025-09-01 00:37:55 +03:00
9f1eeeb5c8 [prettier] auto-fix 2025-08-31 02:53:41 +03:00
04a5bd5ad3 Merge remote-tracking branch 'remotes/origin/release/v9.1.0' into feature/linter-mysql
# Conflicts:
#	.github/workflows/azureStorageTests.yml
#	.github/workflows/s3storageTests.yml
#	Common/config/default.json
#	Common/config/log4js/development.json
#	Common/config/log4js/production.json
#	Common/sources/constants.js
#	Common/sources/logger.js
#	Common/sources/moduleReloader.js
#	Common/sources/operationContext.js
#	Common/sources/storage/storage-az.js
#	Common/sources/storage/storage-fs.js
#	Common/sources/utils.js
#	DocService/sources/DocsCoServer.js
#	DocService/sources/ai/aiProxyHandler.js
#	DocService/sources/canvasservice.js
#	DocService/sources/converterservice.js
#	DocService/sources/databaseConnectors/oracleConnector.js
#	DocService/sources/fileuploaderservice.js
#	DocService/sources/wopiClient.js
#	DocService/sources/wopiUtils.js
#	FileConverter/sources/converter.js
2025-08-31 02:22:56 +03:00
44cb82b38a [feature] Add pre-commit hook with linter 2025-08-20 11:09:55 +03:00