Alexey Safronov 9174a20871 Merge branch 'develop' into feature/virtual-rooms-1.2 ... # Conflicts: # packages/asc-web-common/api/portal/index.js # packages/asc-web-common/components/Loaders/index.js # packages/asc-web-common/store/SettingsStore.js # packages/asc-web-components/file-input/index.js # packages/asc-web-components/modal-dialog/index.js # packages/asc-web-components/save-cancel-buttons/index.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/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/src/store/ContextOptionsStore.js # public/locales/de/Common.json # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/Shell.jsx # web/ASC.Web.Client/src/components/NavMenu/index.js # web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js # web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js # web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js # web/ASC.Web.Client/webpack.config.js # web/ASC.Web.Editor/src/Editor.jsx		2022-03-24 14:39:52 +03:00
..
AuthStore.js	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +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/virtual-rooms-1.2	2022-03-24 14:39:52 +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