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
..
AuthenticationController.cs	Auth: added session param	2021-11-26 21:59:39 +03:00
CapabilitiesController.cs	ElasticSearch: moved from 08a01422	2021-05-23 19:11:25 +03:00
LdapController.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ModulesController.cs	Api: modules. Added info method	2021-01-25 17:37:26 +03:00
PortalController.cs	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
SecurityController.cs	ElasticSearch: moved from 08a01422	2021-05-23 19:11:25 +03:00
SettingsController.cs	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00
SmtpSettingsController.cs	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
SsoSettingsV2Controller.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ThirdPartyController.cs	Thirdparty: login. Desktop	2021-10-15 11:34:34 +03:00