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
..
Contracts	merge from feature/backend-refactor	2022-03-29 23:29:03 +03:00
Core	moved from ddf515b8	2022-06-02 15:42:45 +03:00
EF	IDE1006	2022-03-25 17:54:34 +03:00
Exceptions	code cleanup	2022-04-14 22:42:15 +03:00
Extensions	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
IntegrationEvents/Events	code cleanup	2022-04-14 22:42:15 +03:00
Log	Log: refactoring	2022-05-26 12:01:54 +03:00
protos	refactoring *.proto files according to https://bit.ly/3KcZ0Ef	2022-01-11 19:28:48 +03:00
Service	moved from ddf515b8	2022-06-16 17:16:46 +03:00
Storage	Log: refactoring	2022-05-26 12:01:54 +03:00
Tasks	moved from ddf515b8	2022-06-02 15:42:45 +03:00
Utils	added new license headers	2022-03-15 21:00:53 +03:00
ActionInvoker.cs	added new license headers	2022-03-15 21:00:53 +03:00
ASC.Data.Backup.Core.csproj	Merge branch 'release/v1.2' into develop	2022-06-19 22:44:48 +03:00
BackupAjaxHandler.cs	moved from ddf515b8	2022-06-14 11:11:41 +03:00
BackupFileUploadHandler.cs	Merge branch 'develop' into feature/backend-refactor	2022-03-28 12:53:15 +03:00
BackupResource.Designer.cs	removed past license headers	2022-03-15 19:59:24 +03:00
BackupResource.el.resx	Resources: backup	2022-05-12 13:22:59 +03:00
BackupResource.fr.resx	Resources: backup	2022-05-12 13:22:59 +03:00
BackupResource.resx	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
BackupResource.tr.resx	Resources: backup	2022-05-12 13:22:59 +03:00
GlobalUsings.cs	moved from ddf515b8	2022-06-02 15:42:45 +03:00