DocSpace-buildtools/web/ASC.Web.Api/Api/Settings
pavelbannov e17f49e344 Merge branch 'develop' into feature/LDAP-new
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/GlobalUsings.cs
2022-06-28 14:30:40 +03:00
..
BaseSettingsController.cs refactoring 2022-04-15 13:27:48 +03:00
CustomNavigationController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
CustomSchemasController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
GreetingSettingsController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
IpRestrictionsController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
LdapController.cs modified logging 2022-06-08 12:42:49 +03:00
LicenseController.cs Merge branch 'develop' into feature/logger-refactoring 2022-05-24 23:13:57 +03:00
MessageSettingsController.cs moved from ddf515b8 2022-06-14 11:11:41 +03:00
OwnerController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
RadicaleController.cs moved from ddf515b8 2022-06-07 21:00:08 +03:00
SecurityController.cs moved from ddf515b8 2022-06-07 21:00:08 +03:00
SettingsController.cs Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
SsoController.cs sso: fix 2022-06-28 12:36:34 +03:00
StorageController.cs moved from ddf515b8 2022-06-07 21:00:08 +03:00
TfaappController.cs moved from ddf515b8 2022-06-07 21:00:08 +03:00
TipsController.cs Merge branch 'develop' into feature/logger-refactoring 2022-05-24 23:13:57 +03:00
VersionController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
WebhooksController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
WhitelabelController.cs removed unused code 2022-06-23 16:00:24 +03:00