DocSpace-buildtools/web/ASC.Web.Api
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
..
Controllers Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-24 14:39:52 +03:00
Core Settings: added update dns settings method 2022-02-17 15:55:42 +03:00
Models Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-24 14:39:52 +03:00
Properties refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
appsettings.json External config 2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
ASC.Web.Api.sln init commit 2019-05-15 17:56:09 +03:00
Program.cs Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
Startup.cs cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00