Tatiana Lopaeva 40d56075f1 Merge branch 'develop' into feature/backup ... # Conflicts: # common/ASC.Data.Backup.Core/EF/BackupsContext.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # common/services/ASC.Data.Backup/Startup.cs # packages/asc-web-common/components/PageLayout/sub-components/section-header.js # products/ASC.Files/Client/public/locales/en/OperationsPanel.json # products/ASC.Files/Client/public/locales/en/Settings.json # products/ASC.Files/Client/public/locales/ru/Settings.json # products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.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.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/webpack.config.js		2022-02-07 12:40:50 +03:00
..
AdvancedSelector	Web: moved PeopleSelector to People	2021-03-17 13:37:22 +03:00
AppLoader	Web: Refactoring	2021-03-13 18:33:43 +03:00
ErrorBoundary	Web: Moved errors from Common to the Web Client.	2021-03-03 11:15:11 +03:00
ErrorContainer	Web: Settings: Added preparation portal page.	2021-06-30 20:09:00 +03:00
ExternalRedirect	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
FilterInput	Merge branch 'develop' into component-tooltips	2022-01-20 15:45:24 +03:00
FloatingButton	Web: Common: added color prop for floating button	2021-11-17 17:37:01 +05:00
Headline	Web: fixed media query	2021-10-06 15:44:39 +03:00
Loaders	Web: Files: Tiles: Loaders: Fixed number of loaders on smartphones	2022-01-19 11:34:32 +03:00
MediaViewer	Fix Bug 53360: Client.Files.Image - Removed the render when opening and closing the file delete dialog.	2021-11-11 13:48:47 +03:00
PageLayout	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
PrivateRoute	Merge branch 'develop' into feature/backup	2021-09-20 16:26:34 +03:00
PublicRoute	Web: fixed login route	2021-09-08 16:24:20 +03:00
index.js	Web: Deleted useless exports.	2021-03-17 16:45:36 +03:00