DocSpace-client/web/ASC.Web.Api/Controllers
pavelbannov 8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
..
AuthenticationController.cs Auth: temp fix for plugin 2021-10-28 20:14:20 +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 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
SecurityController.cs ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
SettingsController.cs Merge branch 'develop' into feature/net6 2021-11-23 16: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