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
..
AuthStore.js	Web: Login: Added usage of new API /authentication.json parameter "session"	2021-12-01 10:56:50 +03:00
index.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
ModuleStore.js	Web: Proxy fixes	2021-03-22 17:35:33 +03:00
SettingsStore.js	Merge branch 'develop' into feature/backup	2021-10-25 11:02:42 +03:00
TfaStore.js	Web: Common: added backupCodes in tfa store	2021-06-08 14:19:36 +03:00
UserStore.js	Fix Bug 53454 - Client: Sign out. Error on api/2.0/people/@self.json	2021-11-10 15:52:36 +03:00