|
|
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 |
|
|
|
f15953bbe4
|
Revert "oform" config + added "upload" section
|
2023-09-19 13:43:26 +04:00 |
|
|
|
4b368870ab
|
Added new FormGallery config (+ extended API settings)
|
2023-09-19 13:11:34 +04:00 |
|
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
|
|
c3276c3146
|
Merge remote-tracking branch 'remotes/origin/feature/web-plugins' into feature/system-web-plugins
|
2023-09-18 14:00:54 +03:00 |
|
|
|
2783548a5f
|
ASC.Web.Core: WebPluginManager: trying to read system plugins by url
|
2023-09-15 19:20:45 +03:00 |
|
|
|
291ae6da13
|
Csp: oform
|
2023-09-15 11:25:11 +03:00 |
|
|
|
06078ffd2d
|
Oauth: Twitter
|
2023-09-15 00:01:08 +03:00 |
|
|
|
d0b16d8b8d
|
Auth: fix apple
|
2023-09-14 18:00:34 +03:00 |
|
|
|
7aff59b652
|
update urlShortener
|
2023-09-13 16:49:29 +03:00 |
|
|
|
d68b8c4895
|
Web: enable plugins
|
2023-09-13 16:29:01 +03:00 |
|
|
|
65a43a86dd
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-13 10:14:35 +03:00 |
|
|
|
c226be46ff
|
Csp: domains from config
|
2023-09-11 15:00:04 +03:00 |
|
gazizova-vlada
|
5cd7202515
|
Merge branch 'develop' into feature/rooms-icons
|
2023-09-11 11:58:06 +03:00 |
|
|
|
bf0ef4cbd1
|
Files: logo colors moved to conf
|
2023-09-08 17:35:17 +03:00 |
|
mushka-n
|
e1d989c6d2
|
merge develop + merge fix
|
2023-09-08 03:27:39 +03:00 |
|
|
|
bc57cd84d0
|
build: docker: dev: added dnsmasq for local domain routing
|
2023-09-06 18:24:58 +04:00 |
|
|
|
bb7da689cb
|
ASC.Web.Core: WebPluginManager: separate storage for system plugins
|
2023-09-05 18:44:14 +03:00 |
|
|
|
96b916d81e
|
Merge branch 'hotfix/v1.1.3' into develop
|
2023-09-05 09:45:42 +04:00 |
|
|
|
2b86dd25df
|
Merge branch 'develop' into feature/change-chunk-size-s3-copy-and-backup
# Conflicts:
# config/backup.json
|
2023-09-04 23:11:47 +03:00 |
|
|
|
d864448da5
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/PortalController.cs
|
2023-09-04 23:01:50 +03:00 |
|
