Tatiana Lopaeva aa6c02b190 Merge branch 'develop' into feature/backup ... # Conflicts: # common/ASC.Data.Backup.Core/Core/NotifyHelper.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # packages/asc-web-common/api/settings/index.js # packages/asc-web-common/components/PrivateRoute/index.js # packages/asc-web-common/store/SettingsStore.js # products/ASC.Files/Client/public/locales/en/SelectFile.json # products/ASC.Files/Client/public/locales/ru/SelectFile.json # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Client/src/Shell.jsx		2021-09-20 16:26:34 +03:00
..
Auth	fix CookieAuthHandler	2021-09-08 13:16:58 +03:00
Convention	added ControllerNameAttributeConvention	2021-04-02 18:46:00 +03:00
Core	fix CookieAuthHandler	2021-09-08 13:16:58 +03:00
Middleware	add Tenant status in settings and refactoring tenantStatusFilter	2021-06-30 17:26:46 +03:00
Model	Scope: refactoring	2020-10-19 18:53:15 +03:00
Routing	Files: thirdparty fix	2020-03-16 11:25:39 +03:00
ASC.Api.Core.csproj	fixed run via vs	2021-08-23 15:55:19 +03:00