pavelbannov 789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo ... # Conflicts: # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.Files/Core/GlobalUsings.cs # products/ASC.Files/Service/Core/FilesModule.cs # products/ASC.Files/Service/Core/FoldersModule.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Core/QuotaSync.cs # web/ASC.Web.Core/Users/UserManagerWrapper.cs		2022-11-09 12:57:16 +03:00
..
Billing	fix usings	2022-11-07 12:34:50 +03:00
Caching	Merge branch 'develop' into feature/remove-waste	2022-11-07 11:25:54 +03:00
Configuration	remove waste asc.core.common	2022-09-07 15:45:23 +03:00
Context	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-09 12:57:16 +03:00
Core	Merge branch 'develop' into feature/remove-waste	2022-11-07 11:25:54 +03:00
Data	fix usings	2022-11-07 12:34:50 +03:00
EF	fix migration	2022-11-07 13:43:49 +03:00
Encryption	fix ASC.Data.Storage.Encryption	2022-10-19 13:12:33 +03:00
Hosting	fix usings	2022-11-07 12:34:50 +03:00
Log	fix usings	2022-11-07 12:34:50 +03:00
Messaging	fix	2022-10-11 13:14:50 +03:00
Notify	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-09 12:57:16 +03:00
Properties
protos	Payments: fix cache	2022-10-05 12:12:16 +03:00
Quota	Merge branch 'develop' into feature/rights-rework	2022-10-19 15:31:14 +03:00
Radicale
Security	refactor	2022-10-18 14:22:02 +03:00
Settings
Tenants	Merge branch 'develop' into feature/remove-waste	2022-11-07 11:25:54 +03:00
Tests
Users	Merge branch 'develop' into feature/invite-accounts	2022-10-27 19:18:07 +03:00
WhiteLabel
ASC.Core.Common.csproj	another fix quota	2022-10-19 16:22:13 +03:00
BaseCommonLinkUtility.cs
ByteConverter.cs	UserQuota: fix	2022-09-10 18:07:50 +03:00
GeolocationHelper.cs	Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController	2022-08-25 23:09:12 +03:00
GlobalUsings.cs	fix usings	2022-11-07 12:34:50 +03:00
HostedSolution.cs	Merge branch 'develop' into feature/remove-waste	2022-10-19 14:18:52 +03:00
MultiRegionHostedSolution.cs	Merge branch 'develop' into feature/remove-waste	2022-10-17 14:31:57 +03:00