|
|
8b4c71be7e
|
Merge pull request #54 from ONLYOFFICE/bugfix/64923
Bugfix/64923
|
2023-11-09 07:18:39 -08:00 |
|
|
|
6ac0c7e783
|
Merge remote-tracking branch 'remotes/origin/release/v2.0.0' into bugfix/64923
# Conflicts:
# config/appsettings.json
|
2023-11-09 15:42:05 +03:00 |
|
|
|
8ce55ae9b9
|
fix Bug 64923 ( added frame-src, connect-src, media-src )
|
2023-11-09 15:35:20 +03:00 |
|
|
|
8e8d381514
|
fix bug 65011
|
2023-11-09 15:17:43 +03:00 |
|
|
|
1d5a4ffea8
|
Merge branch 'release/v2.0.0' into bugfix/64787
|
2023-11-09 13:58:52 +04:00 |
|
|
|
ae6e20522a
|
csp only for html
|
2023-11-08 23:53:42 +03:00 |
|
|
|
374099b1e5
|
csp only for html
|
2023-11-08 19:19:04 +03:00 |
|
|
|
d7fe0c18d3
|
OFormSettings: added dashboard path
|
2023-11-07 15:28:04 +03:00 |
|
|
|
c85d82d4d2
|
added AWS DynamoDB connection string
|
2023-11-07 13:09:44 +03:00 |
|
|
|
eabddf8efb
|
nlog: ignore /health/ requests
|
2023-11-05 18:36:21 +03:00 |
|
|
|
b136ff88fb
|
fix bug 64787
|
2023-11-02 18:43:46 +03:00 |
|
|
|
6f1090785f
|
Merge pull request #25 from ONLYOFFICE/bugfix/64684
Store: added IDataStoreValidator
|
2023-11-01 05:54:23 -07:00 |
|
|
|
1e00e70556
|
fix backup.json
|
2023-11-01 15:48:14 +03:00 |
|
|
|
7eeb155b4e
|
fix Bug 64628 - Fix log level for error failed to get redis key
|
2023-11-01 16:47:46 +07:00 |
|
|
|
6230df5c40
|
fix Bug 64869
|
2023-10-30 20:33:01 +03:00 |
|
|
|
b8cdde4db0
|
fix Bug 64787
|
2023-10-24 20:01:16 +03:00 |
|
|
|
103e93dbab
|
fix Bug 64808
|
2023-10-24 18:58:28 +03:00 |
|
|
|
2b112d9344
|
Store: added IDataStoreValidator
|
2023-10-20 17:25:21 +03:00 |
|
|
|
bc9f3f5c07
|
Cfg: fixed UserNameRegex
|
2023-10-20 16:31:19 +03:00 |
|
|
|
38dd71539b
|
Cfg: added UserNameRegex
|
2023-10-20 14:47:57 +03:00 |
|
|
|
7079467cc8
|
Add gzip config level to router (#16)
* Modify gzip config level and proxied
* Modify gzip config
* Modify gzip config
|
2023-10-12 18:44:39 +03:00 |
|
|
|
bc9f96ee7d
|
Fix bad merge
|
2023-10-03 19:13:51 +04:00 |
|
|
|
78a222ebd1
|
merge from develop
|
2023-10-03 17:38:22 +03:00 |
|
|
|
25241c61d4
|
drop all files for backend/frontend
|
2023-10-02 13:23:37 +03:00 |
|
|
|
09466caed0
|
moved config to build/condig folder
|
2023-10-02 13:16:45 +03:00 |
|
|
|
55d92a8fa6
|
nginx: fixed log
|
2023-09-29 21:59:55 +03:00 |
|
|
|
4d19a8b212
|
Merge pull request #1675 from ONLYOFFICE/feature/web-plugins
Feature/web plugins
|
2023-09-29 18:58:13 +04:00 |
|
|
|
18d5c7c659
|
Web: disable upload and delete plugin
|
2023-09-29 17:45:28 +03:00 |
|
|
|
2987cf797b
|
nginx: support pass for redis. bug fixed
|
2023-09-29 17:26:43 +03:00 |
|
|
|
0d8bd872d6
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 17:21:34 +04:00 |
|
|
|
e4faab8fc1
|
Nginx: Removed useless temp route
|
2023-09-29 15:23:04 +04:00 |
|
|
|
aa26f284fa
|
Merge branch 'feature/web-plugins' of github.com:ONLYOFFICE/DocSpace into feature/web-plugins
|
2023-09-29 10:36:31 +03:00 |
|
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
|
|
006c552ae6
|
Merge remote-tracking branch 'remotes/origin/feature/web-plugins' into feature/system-web-plugins
|
2023-09-26 14:40:33 +03:00 |
|
|
|
6af5cf8295
|
ASC.Web.Core: WebPluginManager: read system plugins from storage
|
2023-09-26 14:37:57 +03:00 |
|
Viktor Fomin
|
26bb33516a
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-26 13:06:45 +03:00 |
|
|
|
8b3ddf69f3
|
fix merge
|
2023-09-25 11:45:29 +03:00 |
|
Viktor Fomin
|
c30c6742a2
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-25 11:00:51 +03:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
Viktor Fomin
|
4719e679d9
|
Nginx: add sendtgreport location
|
2023-09-24 21:29:36 +03:00 |
|
Viktor Fomin
|
e45c17b03b
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-24 11:49:14 +03:00 |
|
|
|
dc27c8d8fc
|
nlog: fixed
|
2023-09-23 09:50:53 +03:00 |
|
|
|
5a530364c7
|
nlog: remove /health logs
|
2023-09-22 13:15:44 +03:00 |
|
Viktor Fomin
|
4a9ed75b2b
|
Config: add telegramConf
|
2023-09-21 14:56:57 +03:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
|
|
b25b39da14
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-20 14:55:39 +03:00 |
|
|
|
94bf145445
|
Merge branch 'develop' into feature/urlShortener
|
2023-09-19 19:45:18 +03:00 |
|
|
|
c1a75f0ae2
|
ASC.Web.Core: WebPluginManager: small fixes
|
2023-09-19 14:06:04 +03:00 |
|
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
