IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
dc939846c4
DocSpace-buildtools/web/ASC.Web.Api/Api/Settings
History
pavelbannov 9eba173a44 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Model/CreateFileModel.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-04-21 22:36:29 +03:00
..
BaseSettingsController.cs refactoring 2022-04-15 13:27:48 +03:00
CustomNavigationController.cs refactoring 2022-04-15 13:27:48 +03:00
CustomSchemasController.cs refactoring 2022-04-15 13:27:48 +03:00
GreetingSettingsController.cs refactoring 2022-04-15 13:27:48 +03:00
IpRestrictionsController.cs refactoring 2022-04-15 13:27:48 +03:00
LicenseController.cs refactoring 2022-04-15 13:27:48 +03:00
MessageSettingsController.cs Merge branch 'develop' into feature/backend-refactor 2022-04-21 22:36:29 +03:00
OwnerController.cs refactoring 2022-04-15 13:27:48 +03:00
SecurityController.cs Merge branch 'develop' into feature/backend-refactor 2022-04-21 22:36:29 +03:00
SettingsController.cs Merge branch 'develop' into feature/backend-refactor 2022-04-21 22:36:29 +03:00
StorageController.cs refactoring 2022-04-15 13:27:48 +03:00
TfaappController.cs refactoring 2022-04-15 13:27:48 +03:00
TipsController.cs refactoring 2022-04-15 13:27:48 +03:00
VersionController.cs refactoring 2022-04-15 13:27:48 +03:00
WebhooksController.cs refactoring 2022-04-15 13:27:48 +03:00
WhitelabelController.cs refactoring 2022-04-15 13:27:48 +03:00