AlexeySafronov bedfad1ec5 Merge branch 'master' into develop ... # Conflicts: # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs # products/ASC.Files/Client/src/pages/Home/Section/Header/index.js # products/ASC.Files/Client/src/store/DialogsStore.js # products/ASC.Files/Client/src/store/FilesActionsStore.js # products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs # products/ASC.Files/Core/Core/EF/FilesDbContext.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs # products/ASC.Files/Server/DocStore # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Tfa/TfaManager.cs		2021-12-28 18:21:44 +03:00
..
ASC.Api.Core	Webhooks: fix empty result	2021-12-14 15:51:03 +03:00
ASC.Common	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
ASC.Core.Common	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
ASC.Data.Backup.Core	Removed unused dependencies. Fixed tests	2021-11-24 12:39:39 +03:00
ASC.Data.Encryption	Merge branch 'develop' into feature/net6	2021-10-22 16:10:37 +03:00
ASC.Data.Reassigns	Removed unused dependencies. Fixed tests	2021-11-24 12:39:39 +03:00
ASC.Data.Storage	Optimization	2021-12-09 20:23:06 +03:00
ASC.FederatedLogin	Files: optimization	2021-12-16 15:49:35 +03:00
ASC.Feed	net6	2021-08-25 18:26:13 +03:00
ASC.IPSecurity	net6	2021-08-25 18:26:13 +03:00
ASC.MessagingSystem	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
ASC.Notify.Textile	net6	2021-08-25 18:26:13 +03:00
ASC.Resource.Manager	ResManager: fix	2021-09-17 16:46:24 +03:00
ASC.Socket.IO	Bump redis from 2.8.0 to 3.1.1 in /common/ASC.Socket.IO	2021-04-27 18:30:56 +00:00
ASC.SsoAuth	SsoAuth: 2e37dcd0	2021-05-31 11:35:42 +03:00
ASC.Textile	net6	2021-08-25 18:26:13 +03:00
ASC.Thumbnails	fix warning	2021-10-27 12:33:39 +03:00
ASC.UrlShortener	Added url shortener service	2020-03-05 14:45:34 +03:00
ASC.VoipService	net6: refactoring and bugfix	2021-10-21 16:23:26 +03:00
ASC.Webhooks.Core	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
services	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Tests	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Tools/AutoMigrationCreator	AutoMigrationCreator: add new ef core dependencies	2021-11-30 13:32:16 +03:00