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
..
combineUrl.js	Web: Proxy fixes	2021-03-22 17:35:33 +03:00
encoder.js	Fix Bug 53524 - Client.Profile|List: User's display name with diacritics invalid	2021-11-09 19:32:15 +03:00
firebase.js	Web: Common: move firebase config from hotfix/campaigns banner	2022-02-15 11:34:15 +03:00
index.js	Web: Common: get sso translate	2022-02-03 01:10:12 +03:00
socket.js	Web: Socket: Added "restore-backup" event listeners	2022-02-25 19:08:02 +03:00
wdyr.js	Web: Updated @welldone-software/why-did-you-render, move it to the common devDependencies	2021-09-08 16:52:56 +03:00
withLayoutSize.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00