|
986561d4e9
|
Merge branch 'develop' into feature/delete-portal
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbAzService.cs
# common/ASC.Core.Common/Data/DbQuotaService.cs
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# common/ASC.Feed/Data/FeedAggregateDataProvider.cs
# common/ASC.Feed/Data/FeedReadedDataProvider.cs
# common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
# common/services/ASC.ApiSystem/Controllers/PeopleController.cs
# migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/ConnectionsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/LicenseController.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
# web/ASC.Web.Core/Sms/SmsManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2023-06-08 15:53:31 +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 |
|
|
8d7219c0e0
|
async refactoring
|
2023-05-19 14:42:02 +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 |
|
|
a1f63b88ea
|
SSO: fixed redirect to login on error
|
2023-04-26 14:39:49 +03:00 |
|
|
4a1e1a88e7
|
add dbTenant in models and rename "tenant" to "tenantid"
|
2023-04-25 00:17:29 +03:00 |
|
|
f35671c7dc
|
SSO: fixed a re-login
|
2023-04-19 17:55:09 +03:00 |
|
|
44317ee151
|
WebstudioDbContext -async
|
2023-03-24 19:24:59 +03:00 |
|
|
63ee0ca117
|
UserDbContext - async
|
2023-03-24 10:53:49 +03:00 |
|
|
a3800de721
|
TenantDbContext -async part1
|
2023-03-20 19:16:00 +03:00 |
|
|
603fc8cc0f
|
MessagesContext - async
|
2023-03-16 18:23:59 +03:00 |
|
|
405ed839bb
|
CoreDbContext -async
|
2023-03-14 23:44:44 +03:00 |
|
|
c1e3d9fb95
|
Web.Core: refactor
|
2023-02-20 11:16:03 +03:00 |
|
|
b0b3e6df71
|
Web: refactor
|
2023-02-17 17:53:41 +03:00 |
|
|
141bed97b4
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
|
2022-11-02 11:16:29 +03:00 |
|
|
92ef73eb86
|
async UpdateUserInfo and SaveUserInfo
|
2022-10-25 18:27:56 +03:00 |
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +03:00 |
|
|
1a5c273825
|
refactor
|
2022-10-18 14:43:31 +03:00 |
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +03:00 |
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
|
5848bf5cd3
|
Api: payments check
|
2022-09-19 17:56:45 +03:00 |
|
|
6b728a0fca
|
refactoring
|
2022-09-15 18:58:05 +03:00 |
|
|
12c7a28c21
|
Core: fix
|
2022-09-13 15:11:09 +03:00 |
|
|
83e7ad25d2
|
SSO: fixed successful login
|
2022-08-09 17:14:35 +03:00 |
|
|
bfe43ebe96
|
SSO: fix login
|
2022-08-09 16:53:22 +03:00 |
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
91c4e454c5
|
add loggers
|
2022-05-20 18:24:41 +03:00 |
|
|
a585a425bc
|
fix
|
2022-05-20 17:02:09 +03:00 |
|
|
411e3b7f58
|
Sso: fix
|
2022-05-13 11:52:49 +03:00 |
|
Vashchuk Nikita
|
44cf5d7f80
|
fix
|
2022-04-29 18:25:49 +03:00 |
|
Vashchuk Nikita
|
b8ed834eba
|
fix
|
2022-04-29 10:49:56 +03:00 |
|
Vashchuk Nikita
|
f39a476d06
|
added SsoController, fix
|
2022-04-28 16:56:12 +03:00 |
|
Vashchuk Nikita
|
442a6bb30a
|
Merge branch 'develop' into feature/SSO-new
# Conflicts:
# config/nginx/onlyoffice.conf
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Studio/Startup.cs
|
2022-04-28 15:45:11 +03:00 |
|
Vashchuk Nikita
|
258cf02d27
|
fix ssoHandler
|
2022-04-26 14:10:12 +03:00 |
|
Vashchuk Nikita
|
1431c5ec80
|
fix
|
2022-04-26 12:27:12 +03:00 |
|
Vashchuk Nikita
|
e812d3ec53
|
fix
|
2022-04-26 11:49:55 +03:00 |
|
Vashchuk Nikita
|
422e87af13
|
added ssoHandler
|
2022-04-25 21:41:26 +03:00 |
|