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
..
public	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00
src	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00
.babelrc	Web: Client: init re-write to webpack 5	2020-11-27 20:40:38 +03:00
.env	Web: Clinet: Added default params to .env	2021-03-12 18:16:51 +03:00
.gitattributes	Web: Client: init re-write to webpack 5	2020-11-27 20:40:38 +03:00
.gitignore	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
analyse.js	Web: Client: Added Webpack-bundle-analyzer	2020-08-31 11:43:26 +03:00
Dockerfile	Web: Client: init re-write to webpack 5	2020-11-27 20:40:38 +03:00
jsconfig.json	Web: applied new import from appserver/components	2021-02-24 20:11:23 +03:00
package.json	Web: init e2e tests	2021-12-21 15:59:11 +08:00
webpack.config.js	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00