Commit Graph

3536 Commits

Author SHA1 Message Date
569330129b move api redirect uri from login provider 2023-09-06 10:13:46 +03:00
2fd15b4108
Merge pull request #1699 from ONLYOFFICE/refacroting/csp-to-core
common: move cspsettings from web.api to core.common project
2023-09-04 10:44:38 -07:00
d3198671ba Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
#	packages/common/constants/index.js
2023-09-04 16:38:06 +03:00
ba2233ca7a common: move cspsettings from web.api to core.common project 2023-09-04 15:13:18 +03:00
f6ca59874d zoom: add keys and add in AuthProviders 2023-09-04 14:46:48 +03:00
1e0944b796 SSO: Changed authUrl 2023-08-31 14:32:47 +04:00
d39cb60c38 backend: added index (by creation_date column) to table notify_queue 2023-08-30 12:50:55 +03:00
Eloncase
65fa314059 apisystem: zoom: handle store link
# Conflicts:
#	common/services/ASC.ApiSystem/Controllers/ZoomController.cs
2023-08-29 14:04:40 +03:00
Eloncase
771b07b81b ApiSystem: redirect if user and portal exists
# Conflicts:
#	common/services/ASC.ApiSystem/Controllers/ZoomController.cs
2023-08-29 14:00:42 +03:00
Eloncase
86eaf2dd8d FederatedLogin: zoom login provider 2023-08-29 14:00:31 +03:00
d9aaa8b968 fix bug 63554 2023-08-29 13:34:48 +03:00
58087f2326 Merge branch 'hotfix/v1.1.2' into bugfix/63774-local-restore 2023-08-28 18:55:58 +03:00
a1c4031cc6 upload backup: max size 2023-08-28 16:44:40 +03:00
c3a9966464 fix create backup hash 2023-08-28 14:57:16 +03:00
84ef14f857 Fix SSO errors redirect 2023-08-28 13:17:00 +04:00
ff66f27a1a fix 2023-08-28 12:16:33 +03:00
16c5103d4f fix 2023-08-28 12:03:33 +03:00
d475451899 fix backup upload 2023-08-28 12:01:36 +03:00
9c8ee8cbbc fix backup upload 2023-08-28 11:49:25 +03:00
66081e8428 fixed warning 2023-08-25 17:20:17 +03:00
90fae33cb6 Csp: cdn for images 2023-08-25 16:35:41 +03:00
0d1b4adc4f Update BackupFileUploadHandler.cs 2023-08-25 15:21:04 +03:00
a8c133f4ca fix backup upload handler 2023-08-25 12:51:15 +03:00
a5721ed885 fix Bug 63765 2023-08-24 17:05:05 +03:00
4129592b31 fix Bug 60163 2023-08-23 19:38:12 +03:00
01237127a0 fix 2023-08-23 19:37:27 +03:00
80b9aafbb9 fix Bug 61152 2023-08-23 15:59:44 +03:00
56b7d2be44 fix Bug 63727 - Settings: Restore. 2023-08-22 14:00:04 +03:00
3a2b455019 Bug 63729 - Srv:Restore. restore from localfile 2023-08-22 13:15:34 +03:00
c64f6b0f66 Bug 63646 2023-08-21 10:53:33 +03:00
112d796b72 Csp: localhost 2023-08-18 17:01:32 +03:00
44a1021614 Migration: temporary removed postgre 2023-08-18 15:20:55 +03:00
416092f3f9 Quota: admin quota default price now is 15 2023-08-18 15:20:23 +03:00
88a06cc8da Merge branch 'hotfix/v1.1.2' into feature/csp 2023-08-17 17:38:35 +03:00
58d328431a Affiliates: fixed mapping 2023-08-17 17:27:50 +03:00
f9ff3fc378 Merge branch 'hotfix/v1.1.2' into feature/affiliate-link 2023-08-17 14:11:05 +03:00
d5db98fce2 Migrations: DbQuota: added new data 2023-08-17 12:28:19 +03:00
7c2c122a82 Migration: tenants_partners 2023-08-16 22:00:11 +03:00
629940db44 Merge branch 'hotfix/v1.1.2' into feature/affiliate-link 2023-08-16 19:44:24 +03:00
a822865b55 fix 2023-08-16 19:43:55 +03:00
d7897fa890 added DbTenantPartner 2023-08-16 18:42:56 +03:00
194d743e22 ASC.Core.Common: DbQuota: added new data 2023-08-16 17:36:34 +03:00
95083786fe Csp: fix domain and header 2023-08-15 17:11:41 +03:00
8bc220a926 revert 2023-08-15 16:36:23 +03:00
dab87902a2 Merge branch 'hotfix/v1.1.2' into feature/csp 2023-08-09 15:49:58 +04:00
96834370d8 RabbitMQ: update version. refactoring 2023-08-08 14:43:29 +03:00
bddbcd02c4 Merge branch 'hotfix/v1.1.2' into feature/csp
# Conflicts:
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-08-08 14:13:52 +03:00
c5d4272685 Revert "fixed rabbitmq connection leak"
This reverts commit 633ed22763.
2023-08-08 13:40:04 +03:00
50e2b26f95 Bug 63557 - Settings: Restore. 2023-08-07 17:06:46 +03:00
2a7b044307
Merge hotfix/1.1.2 into hotfix/v1.1.2
Merge hotfix/1.1.2 into hotfix/v1.1.2
2023-08-07 15:42:56 +03:00