|
|
eefb4b5e2e
|
refactoring:Authorization replace mvc filter to route
|
2023-06-16 19:46:14 +03:00 |
|
|
|
7ba5cc975b
|
Webhooks: fixed migrations
|
2023-06-07 21:23:38 +03:00 |
|
|
|
f4f5edec05
|
Merge branch 'develop' into feature/webhooks-page
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
|
2023-06-06 01:49:14 +03:00 |
|
|
|
746962bc06
|
Merge branch 'develop' into features/security-elasticsearch
|
2023-06-01 15:45:31 +03:00 |
|
Vladimir Khvan
|
7619fe03e8
|
Merge branch 'develop' into feature/webhooks-page
|
2023-05-31 16:05:47 +05:00 |
|
|
|
bd62a2a4fd
|
removed .result
|
2023-05-31 10:42:09 +03:00 |
|
|
|
6c78438b75
|
Merge branch 'develop' into feature/optimization-ef
# Conflicts:
# common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/RegionHelper.cs
# common/ASC.Core.Common/Data/DbQuotaService.cs
# common/ASC.Core.Common/GeolocationHelper.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/ConnectionsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/RadicaleController.cs
# web/ASC.Web.Api/Api/Settings/TfaappController.cs
# web/ASC.Web.Api/Core/QuotaHelper.cs
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
|
2023-05-30 14:13:02 +03:00 |
|
|
|
e5359fad09
|
fix
|
2023-05-30 11:26:25 +03:00 |
|
|
|
19e8b2210a
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/helpers/constants.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/common/components/Section/index.js
# packages/components/floating-button/styled-floating-button.js
# packages/login/src/client/App.tsx
# packages/login/src/client/components/Invalid/index.tsx
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# yarn.lock
|
2023-05-29 14:36:12 +03:00 |
|
|
|
845aaa085f
|
Quota: cache by region
|
2023-05-27 19:44:29 +03:00 |
|
|
|
dc6b076ea8
|
fix
|
2023-05-26 14:06:44 +03:00 |
|
|
|
8d088c30ce
|
remove internal methods
|
2023-05-26 13:45:41 +03:00 |
|
|
|
18d04bf45a
|
fix
|
2023-05-25 18:24:26 +03:00 |
|
|
|
ef7795f2df
|
Backup: fixed payment after restore
|
2023-05-24 19:33:10 +03:00 |
|
|
|
48b580f1b0
|
added translations
|
2023-05-24 18:25:14 +03:00 |
|
|
|
76db809e3b
|
fix
|
2023-05-24 17:39:00 +03:00 |
|
|
|
d78a777a9d
|
fix
|
2023-05-24 17:16:41 +03:00 |
|
|
|
7fb137ace1
|
valueTask instend of Task Internal
|
2023-05-24 12:40:59 +03:00 |
|
|
|
f34cab4bf3
|
remove wait
|
2023-05-24 10:15:16 +03:00 |
|
|
|
395faf8121
|
fixed Bug 62708
|
2023-05-23 15:02:01 +03:00 |
|
NikitaVashchuk
|
d1eeb6263c
|
removed uri size limit for webhook config
|
2023-05-22 16:10:15 +05:00 |
|
|
|
2f96868672
|
fix
|
2023-05-21 18:59:22 +03:00 |
|
|
|
d7cee576a0
|
fix async
|
2023-05-21 00:48:08 +03:00 |
|
|
|
fab1e08cc5
|
fix GetOldEventsAsync
|
2023-05-21 00:34:05 +03:00 |
|
|
|
e1bbd9a389
|
fix GetOldEventsAsync
|
2023-05-21 00:28:04 +03:00 |
|
|
|
76e80de7be
|
fix ElasticSearchService- ReIndex
|
2023-05-21 00:23:44 +03:00 |
|
|
|
fd3f479f7f
|
IResourceFilter to IAsyncResourceFilter
|
2023-05-21 00:09:11 +03:00 |
|
|
|
8f1e35b818
|
added translations
|
2023-05-19 17:23:00 +03:00 |
|
|
|
8d7219c0e0
|
async refactoring
|
2023-05-19 14:42:02 +03:00 |
|
|
|
5cc7d38737
|
fix
|
2023-05-18 19:26:23 +03:00 |
|
|
|
819c6597f4
|
added translations
|
2023-05-18 18:23:26 +03:00 |
|
|
|
986361b4a0
|
People: new filter AccountLoginType
|
2023-05-17 11:20:27 +03:00 |
|
|
|
9b5d90ff6f
|
fix merge
|
2023-05-17 11:01:43 +03:00 |
|
|
|
5cbdfdef9b
|
Merge branch 'develop' into feature/optimization-ef
|
2023-05-17 11:01:32 +03:00 |
|
|
|
f5cb9d9e21
|
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
# Conflicts:
# common/services/ASC.AuditTrail/AuditReportResource.de.resx
# common/services/ASC.AuditTrail/AuditReportResource.tr.resx
# common/services/ASC.AuditTrail/AuditReportResource.uk-UA.resx
|
2023-05-16 21:53:23 +03:00 |
|
|
|
24081d3fdd
|
added translations
|
2023-05-16 18:43:39 +03:00 |
|
|
|
5521b925e8
|
Webhooks: added total for Webhooks journal
|
2023-05-16 12:22:53 +03:00 |
|
|
|
63b0370a07
|
Webhooks: fixed query
|
2023-05-16 11:51:02 +03:00 |
|
|
|
dc805b8cbd
|
Fix UselessModuleTranslationKeysTest issue (key: FreeStartupPlan)
|
2023-05-16 12:46:49 +04:00 |
|
|
|
e0f82c1a86
|
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
|
2023-05-16 11:25:26 +03:00 |
|
|
|
fd45e59e51
|
transfer commit from cs (2e8788596a826d5bb2c015ae9f4314e8385188c6)
|
2023-05-15 20:49:23 +03:00 |
|
|
|
0338a029e8
|
Payments: fixed price for eu
|
2023-05-15 19:30:14 +03:00 |
|
|
|
47a8b890da
|
added translations
|
2023-05-15 17:52:57 +03:00 |
|
|
|
4dc8faeea9
|
fixed RegionHelper
|
2023-05-13 21:37:04 +03:00 |
|
|
|
c65685b9ef
|
fix
|
2023-05-12 22:53:18 +03:00 |
|
|
|
7ca54ad440
|
fix translate tests
|
2023-05-12 22:49:19 +03:00 |
|
|
|
6efa64b91b
|
remove unused resources
|
2023-05-12 22:48:47 +03:00 |
|
|
|
163853751d
|
fix
|
2023-05-12 20:47:41 +03:00 |
|
|
|
2586edcef3
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-12 18:18:45 +03:00 |
|
|
|
dbe48a260d
|
added translations
|
2023-05-12 18:18:10 +03:00 |
|
