IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8e982d5de5
DocSpace-buildtools/config
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
..
nginx Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +03:00
activemq.test.json activemq: added configs 2022-10-24 14:48:53 +03:00
apicache.json refactoring 2022-12-22 18:48:05 +03:00
apisystem.dev.json dbname renamed to docspace 2023-02-22 13:12:29 +03:00
apisystem.json ApiSystem: fix config 2023-04-27 17:42:34 +03:00
appsettings.dev.json Config: Added blank appsettings.dev.json for docker containers 2022-11-22 12:05:39 +03:00
appsettings.json Merge branch 'develop' into feature/deep-link 2023-08-04 19:01:14 +04:00
appsettings.services.json Node: Services: Added new logLevel param 2023-07-24 14:03:52 +04:00
appsettings.test.json dbname renamed to docspace 2023-02-22 13:12:29 +03:00
autofac.consumers.json fix Bug 61700 2023-08-02 13:40:54 +03:00
autofac.json logger refactoring. added resolver ILog/IOptionsMonitor<ILog> 2022-03-17 09:55:08 +03:00
autofac.products.json Revert "removed products" 2023-05-11 11:26:28 +03:00
backup.json backup chunk-size 2023-03-09 15:34:47 +03:00
elastic.json ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
elastic.test.json ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
feed.json discarded feed changes 2022-10-07 17:16:32 +03:00
kafka.json Web: revert config 2022-07-05 23:37:56 +03:00
kafka.test.json kafka disabled by default 2019-08-23 15:49:23 +03:00
nlog.config Merge branch 'develop' into feature/refactoring-nlog 2023-08-02 16:52:12 +03:00
notify.json Notify: removed schedulers. Fixed send 2023-01-19 23:13:29 +03:00
plugins.json Plugins: add logs, config and change service start 2022-08-26 12:51:43 +03:00
rabbitmq.json rabbitmq: extended config 2022-09-08 14:20:01 +03:00
rabbitmq.test.json redditmq: fixed config setup 2022-09-09 15:56:24 +03:00
radicale.config moved from ddf515b8 2022-06-17 18:46:16 +03:00
radicale.log.config moved from ddf515b8 2022-06-17 18:46:16 +03:00
radicale.rights moved from ddf515b8 2022-06-17 18:46:16 +03:00
redis.json merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
socket.json Socket.IO: Move pingInterval and reconnectAttempts to config 2022-02-09 12:11:39 +03:00
socket.test.json socket: fix 2022-03-30 22:26:44 +03:00
ssoauth.json Cosmetic modify 2022-07-05 18:09:51 +03:00
storage.json fix 2023-04-10 17:28:20 +03:00
thumb.json Thumbnails: fix 2020-06-17 14:00:28 +03:00
thumb.test.json Thumb: fix 2020-06-26 12:55:19 +03:00
urlshortener.test.json fix log, added UrlShortenerService config 2020-05-21 11:03:35 +03:00