IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9eba173a44
DocSpace-client/common/services
History
pavelbannov 1dff9e18c4 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.IPSecurity/IPRestrictionsRepository.cs
#	common/ASC.IPSecurity/IPRestrictionsService.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
..
ASC.ApiSystem merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
ASC.AuditTrail code cleanup 2022-04-14 22:42:15 +03:00
ASC.ClearEvents code cleanup 2022-04-14 22:42:15 +03:00
ASC.Data.Backup fixed warnings 2022-04-14 22:23:57 +03:00
ASC.Data.Backup.BackgroundTasks refactoring 2022-04-15 12:08:06 +03:00
ASC.Data.Storage.Encryption add support rabbitmq. split ASC.Data.Backup service on two services 2022-02-04 20:44:03 +03:00
ASC.Data.Storage.Migration merge from feature/backend-refactor 2022-03-09 12:10:30 +03:00
ASC.ElasticSearch Merge branch 'develop' into feature/backend-refactor 2022-04-21 17:51:31 +03:00
ASC.Feed.Aggregator code cleanup 2022-04-14 22:42:15 +03:00
ASC.Notify refactoring 2022-04-15 12:08:06 +03:00
ASC.Radicale add support rabbitmq. split ASC.Data.Backup service on two services 2022-02-04 20:44:03 +03:00
ASC.Studio.Notify Notify: remove serviceProvider 2022-03-29 13:53:05 +03:00
ASC.TelegramService code cleanup 2022-04-14 22:42:15 +03:00
ASC.Thumbnails.Svc merge from feature/backend-refactor 2022-03-09 12:10:30 +03:00
ASC.Webhooks.Service code cleanup 2022-04-14 22:42:15 +03:00