IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
e2cee2c2fc
DocSpace-client/common
History
pavelbannov e2cee2c2fc Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.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/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
..
ASC.Api.Core Merge branch 'develop' into feature/12.0 2022-06-17 19:19:00 +03:00
ASC.Common Merge branch 'develop' into feature/12.0 2022-06-17 19:19:00 +03:00
ASC.Core.Common Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
ASC.Data.Backup.Core Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +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 moved from ddf515b8 2022-06-16 11:13:53 +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 Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +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 Merge branch 'develop' into feature/12.0 2022-06-17 19:19:00 +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-19 22:44:48 +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 Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
Tests Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
Tools/AutoMigrationCreator AutoMigrationCreator: add new ef core dependencies 2021-11-30 13:32:16 +03:00