IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
baea63043c
DocSpace-client/common
History
pavelbannov 7af929fee8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-07-07 17:41:41 +03:00
..
ASC.ActiveDirectory modified LdapNotifyHelper to BackgroundService 2022-07-01 14:49:59 +03:00
ASC.Api.Core Merge branch 'develop' into features/enum_generator 2022-07-05 17:22:43 +03:00
ASC.Common Merge branch 'develop' into features/enum_generator 2022-07-05 17:22:43 +03:00
ASC.Core.Common Merge branch 'release/v1.2' into develop 2022-07-07 17:41:41 +03:00
ASC.Data.Backup.Core Merge branch 'release/v1.2' into develop 2022-06-30 16:13:31 +03:00
ASC.Data.Encryption Merge branch 'develop' into feature/12.0 2022-06-17 19:19:00 +03:00
ASC.Data.Reassigns add loggers 2022-05-20 18:24:41 +03:00
ASC.Data.Storage fix 2022-06-30 17:12:49 +03:00
ASC.EventBus Merge branch 'develop' into feature/logger-refactoring 2022-05-24 23:13:57 +03:00
ASC.EventBus.Extensions.Logger code cleanup 2022-04-14 22:42:15 +03:00
ASC.EventBus.RabbitMQ Log: refactoring 2022-05-26 12:01:54 +03:00
ASC.FederatedLogin removed referencies 2022-07-06 18:47:16 +03:00
ASC.Feed Merge branch 'develop' into feature/12.0 2022-06-17 19:19:00 +03:00
ASC.IPSecurity Merge branch 'develop' into feature/12.0 2022-06-17 19:19:00 +03:00
ASC.MessagingSystem fix tests 2022-06-30 12:07:30 +03:00
ASC.Migration Merge branch 'develop' into feature/12.0 2022-06-17 19:19:00 +03:00
ASC.Notify.Textile Merge branch 'release/v1.2' into develop 2022-06-30 16:13:31 +03:00
ASC.Resource.Manager Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
ASC.Socket.IO Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
ASC.SsoAuth moved from ddf515b8 2022-06-09 18:36:57 +03:00
ASC.Textile refactoring 2022-04-15 12:08:06 +03:00
ASC.Thumbnails moved from ddf515b8 2022-06-09 18:36:57 +03:00
ASC.UrlShortener unified config style 2022-05-31 16:04:24 +03:00
ASC.VoipService backend: updated packages version 2022-04-27 13:02:17 +03:00
ASC.WebDav moved from ddf515b8 2022-06-09 20:33:08 +03:00
ASC.Webhooks.Core Merge branch 'develop' into feature/logger-refactoring 2022-05-20 17:01:51 +03:00
services removed referencies 2022-07-06 18:47:16 +03:00
Tests Merge branch 'release/v1.2' into develop 2022-07-07 17:41:41 +03:00
Tools/AutoMigrationCreator