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
..
dictionaries@8222c8ca5d	Web: Tests:	2021-12-21 16:59:04 +03:00
Models	Web: Tests: Added spellcheck-excludes.json and opportunity to skip some spell check issues	2021-12-22 18:17:22 +03:00
Frontend.Translations.Tests.csproj	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Frontend.Translations.Tests.sln	Tests: Front-end: Added NUnit tests for i18n duplicates	2021-05-17 10:46:43 +03:00
LocalesTest.cs	Web: Tests: Added spellcheck-excludes.json and opportunity to skip some spell check issues	2021-12-22 18:17:22 +03:00
spellcheck-excludes.json	Web: Tests: Added new excludes to spellcheck-excludes.json	2021-12-23 11:36:59 +03:00
SpellCheck.cs	Web: Tests: Added spellcheck-excludes.json and opportunity to skip some spell check issues	2021-12-22 18:17:22 +03:00