pavelbannov 028b63213c Merge branch 'develop' into features/migrate-urlShortener ... # Conflicts: # common/Tools/ASC.Migration.Creator/Program.cs # common/Tools/ASC.Migration.Runner/Program.cs # migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.Designer.cs # migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.cs # migrations/mysql/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs # migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.Designer.cs # migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.cs # migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs # migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.Designer.cs # migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.cs # migrations/postgre/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs # migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs # migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs # migrations/postgre/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Api/Startup.cs # web/ASC.Web.Core/Utility/UrlShortener.cs		2023-07-26 14:30:00 +03:00
..
Billing	fixed payment/account	2023-07-24 13:32:34 +03:00
Caching	People: filter by employeeTypes	2023-07-12 13:10:47 +03:00
Configuration	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Context	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Core	People: filter by employeeTypes	2023-07-12 13:10:47 +03:00
Data	People: filter by employeeTypes	2023-07-12 13:10:47 +03:00
EF	Merge branch 'develop' into features/migrate-urlShortener	2023-07-26 14:30:00 +03:00
Encryption	TenantDbContext -async part2	2023-03-22 11:27:01 +03:00
Hosting	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
Log	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Messaging	Merge branch 'develop' into fix-conflicts-merge	2023-07-21 16:51:49 +03:00
Notify	fix build	2023-07-19 14:34:00 +03:00
Properties
protos
Quota	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Radicale	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Security	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
Settings	Settings: refactoring	2023-02-24 17:19:10 +03:00
Tenants	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
Tests
Users	CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture	2023-04-27 13:15:42 +03:00
WhiteLabel	WebstudioDbContext -async	2023-03-24 19:24:59 +03:00
ASC.Core.Common.csproj	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
BaseCommonLinkUtility.cs	Revert "Revert "backend: removed X-REWRITER-URL header""	2023-05-10 13:07:24 +03:00
ByteConverter.cs
GeolocationHelper.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
GlobalUsings.cs
HostedSolution.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
MultiRegionHostedSolution.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00