DocSpace-client/web/ASC.Web.Api/Controllers
AlexeySafronov f675415228 Merge branch 'master' into release/v1.1.0
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +03:00
..
AuthenticationController.cs moved from 043e301 2021-11-16 20:40:15 +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 moved from 043e301 2021-11-16 20:40:15 +03:00
SecurityController.cs ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
SettingsController.cs moved from 043e301 2021-11-16 20:40:15 +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