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
tests	Web:Tests: fix culture change before test start	2021-12-23 00:09:49 +08:00
.babelrc
.env
.gitignore	Web: init e2e tests	2021-12-21 15:59:11 +08:00
analyse.js
codecept.conf.js	Web:Files:Tests: update codecept config	2021-12-21 18:24:28 +08:00
Dockerfile
jsconfig.json	Web: init e2e tests	2021-12-21 15:59:11 +08:00
package.json	Web: init e2e tests	2021-12-21 15:59:11 +08:00
steps_file.js	Web: init e2e tests	2021-12-21 15:59:11 +08:00
steps.d.ts	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