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
..
Auth	analizators/s1118	2022-01-21 13:47:56 +03:00
Convention	added ControllerNameAttributeConvention	2021-04-02 18:46:00 +03:00
Core	fixed warnings	2022-02-07 20:19:58 +03:00
Middleware	Merge branch 'develop' into feature/backup	2022-02-25 16:05:43 +03:00
Model	People: fix model	2022-02-09 17:51:01 +03:00
Routing	analizators/s3442	2022-01-24 12:57:01 +03:00
ASC.Api.Core.csproj	Packages updated	2022-02-02 19:54:23 +03:00