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
..
install	Merge branch 'release/v1.2' into develop	2022-06-19 22:44:48 +03:00
run	moved from ddf515b8	2022-06-17 18:46:16 +03:00
scripts	moved from ddf515b8	2022-06-16 17:16:46 +03:00
start	winsw: refactoring	2022-02-22 15:45:21 +03:00
tools	fix check	2019-07-16 10:32:09 +03:00
build.backend.bat	added socketio	2022-02-24 13:47:18 +03:00
build.bat	refactoring build script	2021-11-15 19:36:09 +03:00
build.frontend.bat	fixed build.bat	2021-11-21 16:46:09 +03:00
build.static.bat	Build: Removed old products nginx configs	2022-02-22 18:23:56 +03:00
buildAndDeploy.bat	refactoring build scripts	2021-12-24 16:47:37 +03:00
buildAndDeploy.PERSONAL.bat	build: Fix start services on run build/buildAndDeploy.PERSONAL.bat	2022-04-27 19:37:55 +03:00
createMigrations.bat	update run command	2021-10-12 14:17:16 +03:00
Jenkinsfile	Jenkins: fix build	2021-12-23 21:54:42 +03:00
publish.bat	Added url shortener service install scripts	2020-03-05 14:56:07 +03:00
run.e2e.test.bat	Web: rename e2e.test.bat to run.e2e.test.bat and translation.test.bat to run.e2e.translations.tests.bat	2021-12-22 16:42:37 +08:00
run.e2e.translations.tests.bat	Build: Removed old psl replacements	2022-05-20 19:13:01 +03:00
run.e2e.translations.tests.personal.bat	Build: Removed old psl replacements	2022-05-20 19:13:01 +03:00
run.translations.spellcheck.test.bat	Web: Tests:	2021-12-21 16:59:04 +03:00
run.translations.tests.bat	Web: Tests:	2021-12-21 16:59:04 +03:00
runasadmin.bat	refactoring build script	2021-11-15 19:36:09 +03:00