040377198f
People: filter by employeeTypes
2023-07-12 13:10:47 +03:00
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
76db809e3b
fix
2023-05-24 17:39:00 +03:00
d78a777a9d
fix
2023-05-24 17:16:41 +03:00
f34cab4bf3
remove wait
2023-05-24 10:15:16 +03:00
8d7219c0e0
async refactoring
2023-05-19 14:42:02 +03:00
5cc7d38737
fix
2023-05-18 19:26:23 +03:00
986361b4a0
People: new filter AccountLoginType
2023-05-17 11:20:27 +03:00
5cbdfdef9b
Merge branch 'develop' into feature/optimization-ef
2023-05-17 11:01:32 +03:00
1da3a38513
Revert "Revert "backend: removed X-REWRITER-URL header""
...
This reverts commit 39c1824162
2023-05-10 13:07:24 +03:00
976c288d32
Merge branch 'hotfix/v1.0.1' into bugfix/61992
2023-05-08 17:30:29 +03:00
bede99f758
fixed price for current quota
2023-05-07 22:35:39 +03:00
NikitaVashchuk
ea31657287
fix bug 61992
2023-05-05 21:44:35 +05:00
39c1824162
Revert "backend: removed X-REWRITER-URL header"
...
This reverts commit 93ec325611
2023-04-27 22:35:00 +03:00
94ef7b3610
CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture
2023-04-27 13:15:42 +03:00
4a1e1a88e7
add dbTenant in models and rename "tenant" to "tenantid"
2023-04-25 00:17:29 +03:00
93ec325611
backend: removed X-REWRITER-URL header
2023-04-24 16:23:42 +03:00
1711004cfb
backend: using RemoteIpAddress method for get a client ip
2023-04-20 18:24:31 +03:00
2633233cf2
UserManager: fix cache
2023-04-14 18:42:23 +03:00
496085fa48
fix Bug 62023
2023-04-14 15:49:41 +03:00
ed96fe2bdb
refresh quota
2023-04-11 18:58:44 +03:00
4dad1d6067
Merge branch 'develop' into feature/optimization-ef
2023-04-10 23:19:56 +03:00
dc25ce1162
fix async
2023-04-07 11:42:03 +03:00
07d847fdd1
Merge branch 'develop' into feature/optimization-ef
2023-04-06 17:24:05 +03:00
NikitaVashchuk
1827dead7e
fix problems with notify about count paid users
2023-04-04 17:23:46 +05:00
Vashchuk Nikita
0db7c335bf
socket notification when archiving a room,
...
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
Vashchuk Nikita
604b67fa58
functionality for notification ASC.Socket.IO about quota changes
2023-03-30 19:13:13 +05:00
e1b01e2d81
fix methods with task and without async
2023-03-28 13:13:13 +03:00
aac1896a0f
remove CreateDbContextAsync and fix ExecuteAsync
2023-03-28 00:25:55 +03:00
d39c28046c
add CustomSynchronizationContext
2023-03-27 15:04:50 +03:00
44317ee151
WebstudioDbContext -async
2023-03-24 19:24:59 +03:00
63ee0ca117
UserDbContext - async
2023-03-24 10:53:49 +03:00
0abe404476
invitation link: added tariff/quota/permissions check, refactoring
2023-03-23 16:22:01 +03:00
fc78a0508d
TenantDbContext -async part2
2023-03-22 11:27:01 +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
e2f90e5367
fix set quota row
2023-02-28 16:51:37 +03:00
5a65b42177
Core: fixed invite
2023-02-21 19:00:25 +03:00
e171ee44e5
Core: refactor
2023-02-20 11:15:18 +03:00
068004ed28
Core: fix
2023-02-17 18:11:02 +03:00
19899d14e9
Core: added collaborator, refactor
2023-02-17 17:53:18 +03:00
90fdd58d1c
Core: added collaborator group and type
2023-02-17 11:27:27 +03:00
5311005587
fix Bug 60606
2023-01-20 15:34:36 +03:00
0d46e034e7
Files.Service: added users module for feed aggregator
2023-01-18 18:36:06 +03:00
6c112da511
Core: fixed user status change
2022-12-14 14:38:40 +03:00
cd0de88e6c
Core.Common: fix getting user groups
2022-12-08 14:55:05 +03:00
a03b50bd7c
Merge branch 'develop' into release/rc-v1.2.0
2022-12-07 16:20:29 +03:00
61f7765a4f
Merge branch 'develop' into feature/api-origin
2022-12-06 21:47:56 +03:00
