AlexeySafronov
bedfad1ec5
# 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 |
||
---|---|---|
.. | ||
ASC.Api.Core | ||
ASC.Common | ||
ASC.Core.Common | ||
ASC.Data.Backup.Core | ||
ASC.Data.Encryption | ||
ASC.Data.Reassigns | ||
ASC.Data.Storage | ||
ASC.FederatedLogin | ||
ASC.Feed | ||
ASC.IPSecurity | ||
ASC.MessagingSystem | ||
ASC.Notify.Textile | ||
ASC.Resource.Manager | ||
ASC.Socket.IO | ||
ASC.SsoAuth | ||
ASC.Textile | ||
ASC.Thumbnails | ||
ASC.UrlShortener | ||
ASC.VoipService | ||
ASC.Webhooks.Core | ||
services | ||
Tests | ||
Tools/AutoMigrationCreator |