IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c0995c2c03
DocSpace-client/build
History
Ilya Oleshko e531654c54 Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
#	common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
#	common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
#	config/nginx/onlyoffice.conf
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/common/api/files/index.js
#	packages/components/.storybook/preview.js
#	packages/components/package.json
#	packages/editor/src/server/lib/helpers/index.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-08-11 12:47:44 +03:00
..
install Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +03:00
run added slnf 2022-11-23 18:26:50 +03:00
scripts removed build urlshortener.bat 2022-11-24 13:08:21 +03:00
start Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
tools
build.backend.bat added slnf 2022-11-23 18:26:50 +03:00
build.backend.docker.bat Build: Fixed .bat args 2023-03-24 09:57:31 +03:00
build.backend.docker.ps1 Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +03:00
build.backend.docker.sh Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +03:00
build.bat
build.document.server.docker.bat Added run document server docker for development. 2022-11-29 18:50:50 +03:00
build.document.server.docker.ps1 Turn on JWT 2023-02-27 18:52:45 +04:00
build.frontend.bat
build.sh removed build urlshortener.bat 2022-11-24 13:08:21 +03:00
build.static.bat Web: Removed useless for static build 2022-09-02 11:31:35 +03:00
buildAndDeploy.bat
clear.backend.docker.bat Build: Added .bat files: build.backend.docker.bat, start.backend.docker.bat, stop.backend.docker.bat, restart.backend.docker.bat, clear.backend.docker.bat 2022-11-24 15:00:42 +03:00
clear.backend.docker.ps1 Build: Docker: Dev: Added build/clean base images by default for windows 2023-08-09 12:51:06 +03:00
clear.backend.docker.sh Build: Docker: Dev: Added build/clean base images by default 2023-08-09 12:29:39 +04:00
createMigrations.bat fixed createMigrations.bat 2022-08-16 17:46:29 +03:00
Jenkinsfile added slnf 2022-11-23 18:26:50 +03:00
publish.bat
run.backend.translations.tests.bat add Backend.Translations.Tests 2023-05-03 23:31:45 +03:00
run.e2e.test.bat Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
run.e2e.translations.tests.bat Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
run.e2e.translations.tests.personal.bat Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
run.translations.spellcheck.test.bat Translation: Tests: Fix spell check test 2023-04-14 18:21:48 +04:00
run.translations.spellcheck.test.sh Translation: Tests: Fix spell check test 2023-04-14 18:21:48 +04:00
run.translations.tests.bat Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
run.translations.tests.sh Fix frontend tests running 2023-03-09 12:12:31 +04:00
runasadmin.bat
runMigrations.bat merge from develop 2022-12-01 14:52:46 +03:00
runMigrations.sh added slnf 2022-11-23 18:26:50 +03:00
runMigrations.standalone.bat Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00