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
..
ASC.ActiveDirectory	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
ASC.Api.Core	Merge branch 'develop' into features/migrate-urlShortener	2023-07-26 14:30:00 +03:00
ASC.Common	Merge branch 'develop' into fix-conflicts-merge	2023-07-21 16:51:49 +03:00
ASC.Core.Common	Merge branch 'develop' into features/migrate-urlShortener	2023-07-26 14:30:00 +03:00
ASC.Data.Backup.Core	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
ASC.Data.Encryption
ASC.Data.Reassigns	ASC.Data.Reassigns: ReassignProgressItem: progress change	2023-06-29 11:47:43 +03:00
ASC.Data.Storage	Merge branch 'develop' into fix-conflicts-merge	2023-07-21 16:51:49 +03:00
ASC.EventBus	TenantDbContext -async part1	2023-03-20 19:16:00 +03:00
ASC.EventBus.ActiveMQ	fix await using	2023-06-01 14:27:27 +03:00
ASC.EventBus.Extensions.Logger	fix	2023-06-28 20:10:44 +03:00
ASC.EventBus.RabbitMQ	Merge branch 'develop' into feature/optimization-queries	2023-06-01 23:52:40 +03:00
ASC.FederatedLogin	fixed query	2023-06-28 20:17:22 +03:00
ASC.Feed	fix query	2023-06-30 12:22:37 +03:00
ASC.IPSecurity	Merge branch 'develop' into feature/ipsecurity-fixes	2023-07-03 13:22:25 +03:00
ASC.MessagingSystem	Merge branch 'develop' into feature/optimization-queries	2023-06-01 23:52:40 +03:00
ASC.Migration	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
ASC.Notify.Textile	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
ASC.Resource.Manager	fix	2023-03-21 14:47:14 +03:00
ASC.Socket.IO	Merge branch 'develop' into fix-conflicts-merge	2023-07-21 16:51:49 +03:00
ASC.SsoAuth	removed x-rewriter-url	2023-05-03 20:25:50 +03:00
ASC.Textile
ASC.Thumbnails
ASC.UrlShortener
ASC.WebDav	removed x-rewriter-url	2023-05-03 20:25:50 +03:00
ASC.Webhooks.Core	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
ASC.WebPlugins	logger: configure logStreamName in aws logger target on startup	2023-04-13 17:41:23 +03:00
services	Merge branch 'develop' into features/migrate-urlShortener	2023-07-26 14:30:00 +03:00
Tests	Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources	2023-05-16 21:53:23 +03:00
Tools	Merge branch 'develop' into features/migrate-urlShortener	2023-07-26 14:30:00 +03:00