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
..
Settings	Merge branch 'release/v1.2' into develop	2022-06-19 22:44:48 +03:00
AuthenticationController.cs	moved from ddf515b8	2022-06-14 11:11:41 +03:00
CapabilitiesController.cs	moved from ddf515b8	2022-06-07 21:00:08 +03:00
ConnectionsController.cs	moved from ddf515b8	2022-06-14 11:11:41 +03:00
LdapController.cs	replace controllers	2022-03-01 13:03:25 +03:00
ModulesController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
PortalController.cs	moved from ddf515b8	2022-06-14 11:11:41 +03:00
SecurityController.cs	moved from ddf515b8	2022-06-16 11:13:53 +03:00
SmtpSettingsController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
SsoSettingsV2Controller.cs	replace controllers	2022-03-01 13:03:25 +03:00
ThirdPartyController.cs	moved from ddf515b8	2022-06-15 12:46:21 +03:00