pavelbannov 868492b562 Merge branch 'develop' into feature/backend-refactor ... # Conflicts: # common/ASC.Common/Threading/DistributedTaskQueue.cs # common/ASC.Core.Common/Billing/BillingClient.cs # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Notify/Context.cs # common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs # common/ASC.FederatedLogin/Helpers/RequestHelper.cs # common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs # common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs # common/services/ASC.Studio.Notify/Program.cs # common/services/ASC.Webhooks.Service/WebhookSender.cs # products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs # products/ASC.Files/Core/Helpers/DocuSignHelper.cs # products/ASC.Files/Core/Helpers/EasyBibHelper.cs # products/ASC.Files/Core/Helpers/WordpressHelper.cs # products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs # products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs # products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs # products/ASC.Files/Core/ThirdPartyApp/Token.cs # products/ASC.Files/Server/Controllers/FilesController.cs		2022-03-19 22:16:03 +03:00
..
install	Merge branch 'develop' into feature/backend-refactor	2022-03-19 22:16:03 +03:00
run	create new winsw.exe	2022-03-09 14:34:28 +03:00
scripts	add ssoAuth.bat with yarn install	2022-03-04 16:50:12 +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	refactoring build script	2021-11-15 19:36:09 +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	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.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