IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
a66c03aa86
DocSpace-client/products/ASC.Files/Server/Api
History
pavelbannov a66c03aa86 Merge branch 'develop' into feature/logger-refactoring 
# Conflicts:
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Storage/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
#	common/services/ASC.Notify/GlobalUsings.cs
#	common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
#	common/services/ASC.Notify/Services/NotifySenderService.cs
#	common/services/ASC.TelegramService/GlobalUsings.cs
#	common/services/ASC.TelegramService/TelegramHandler.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
2022-05-24 23:13:57 +03:00
..
ApiControllerBase.cs added new license headers 2022-03-15 21:00:53 +03:00
EditorController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
FilesController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
FoldersController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
MasterFormController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
OperationController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
PrivacyRoomController.cs Merge branch 'develop' into feature/logger-refactoring 2022-05-24 23:13:57 +03:00
SecutiryController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
SettingsController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
TagsController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
ThirdpartyController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00
UploadController.cs Api: removed CustomHttpMethodAttribute 2022-05-23 18:48:23 +03:00