Commit Graph

10680 Commits

Author SHA1 Message Date
c221dd6a63
Merge pull request #1747 from ONLYOFFICE/bugfix/bug-64157
fix Bug 64157
2023-09-15 15:49:20 +03:00
291ae6da13 Csp: oform 2023-09-15 11:25:11 +03:00
9287468461 Bug 63993 - get history files 2023-09-14 15:37:08 +03:00
96df6c663f fix Bug 64157 2023-09-14 13:07:19 +03:00
c226be46ff Csp: domains from config 2023-09-11 15:00:04 +03:00
9a9dad8381 CSP: fixed room upload logo 2023-09-05 18:27:34 +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
4439425625 fix Bug 63942 2023-09-01 16:00:56 +03:00
9694959958 Csp: allow all for baseDomain 2023-08-31 18:19:06 +03:00
b94486328f Sso: settings. 2023-08-31 11:17:35 +03:00
9489927284 Merge branch 'hotfix/v1.1.2' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.2 2023-08-30 19:19:28 +03:00
7227d3bd9c Api: logout for sso 2023-08-30 19:19:18 +03:00
ddb2320ac8 fix Bug 63893 2023-08-30 18:54:46 +03:00
d50f033882 Csp: save to redis for InterNetwork ip addresses 2023-08-30 13:46:06 +03:00
eb640f8b56 fixed Bug 63510 2023-08-29 23:21:45 +03:00
ea41ceefe6 bugfix whitelabel 2023-08-26 13:15:06 +03:00
90fae33cb6 Csp: cdn for images 2023-08-25 16:35:41 +03:00
9fd6b701d8 Csp: added ability to set default csp header. 2023-08-25 15:36:59 +03:00
aec0398cc2 fix Bug 63816 2023-08-25 13:01:35 +03:00
99715992ad fix Bug 63776 2023-08-24 12:36:50 +03:00
1332f58b88 fix Bug 62347 and Bug 63716 - Settings:Branding. 2023-08-22 18:37:40 +03:00
112d796b72 Csp: localhost 2023-08-18 17:01:32 +03:00
621bcb6bca Api: hidden methods 2023-08-18 14:33:48 +03:00
88a06cc8da Merge branch 'hotfix/v1.1.2' into feature/csp 2023-08-17 17:38:35 +03:00
03de49bcf1 Csp: zendesk 2023-08-17 13:39:19 +03:00
629940db44 Merge branch 'hotfix/v1.1.2' into feature/affiliate-link 2023-08-16 19:44:24 +03:00
95083786fe Csp: fix domain and header 2023-08-15 17:11:41 +03:00
f8770c467d Csp: fix for firebase 2023-08-15 16:54:33 +03:00
4ff65e2394 fix csp 2023-08-15 16:47:33 +03:00
f2916f2121 bug 63601 2023-08-14 21:03:39 +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
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
1286039f65 fix Bug 62347 - Settings:Branding. 2023-08-07 13:34:29 +03:00
3afe88fbe2 added translations ja 2023-08-04 18:17:58 +03:00
34bdc3431c added translations 2023-08-04 17:53:20 +03:00
2b2c9b0c25 added translations 2023-08-04 17:07:12 +03:00
c889ebed66 added api docs 1.1.1
# Conflicts:
#	common/ASC.Core.Common/EF/Context/UrlShortenerFakeDbContext.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
2023-08-04 13:59:06 +03:00
0f5554e3ef fix bug 63525 2023-08-03 16:53:35 +03:00
06777b395a
Merge pull request #1600 from ONLYOFFICE/feature/api-descriptions
Feature/api descriptions
2023-08-02 08:09:52 -07:00
df20e9e624 api: fix documentation 2023-08-01 11:53:00 +03:00
d2e23e3ed4 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions
# Conflicts:
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/CapabilitiesController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/SmtpSettingsController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
2023-08-01 11:39:57 +03:00
a508c7002a fix Bug 63492 - Welcome letter markup 2023-07-31 23:53:12 +03:00
343c3f766c fix Bug 63409 - Welcome letter markup 2023-07-26 11:53:24 +03:00
f135f37e06 fix Bug 63409 - Welcome letter markup 2023-07-24 21:29:56 +03:00
06bf62f3c3 Smtp: fixed delete smtp method 2023-07-24 18:10:07 +03:00
ee7461718d fix Bug 63381 - letter "Discover business subscription" for saas only 2023-07-19 17:37:52 +03:00
9b32618dd2 added translations 2023-07-14 16:01:54 +03:00