DocSpace-buildtools/web/ASC.Web.Api/Controllers
pavelbannov 570ede7bba Merge branch 'develop' into feature/11.5.2
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
..
AuthenticationController.cs fix auth via password 2021-02-26 22:32:03 +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 Fix getshortenlink 2021-03-21 18:29:35 +03:00
SecurityController.cs ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
SettingsController.cs Merge branch 'develop' into feature/11.5.2 2021-05-31 13:32:51 +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: fix providers 2021-04-26 21:42:39 +03:00