pavelbannov 3e6a417d19 Merge branch 'hotfix/v1.1.2' into develop ... # Conflicts: # common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs # migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs # packages/client/src/components/panels/SelectFileDialog/index.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js # packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js # packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js # packages/client/src/store/ProfileActionsStore.js # packages/common/api/files/index.js # packages/common/store/AuthStore.js # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # yarn.lock		2023-09-01 15:33:39 +03:00
..
nginx	Merge branch 'hotfix/v1.1.2' into develop	2023-09-01 15:33:39 +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 'hotfix/v1.1.2' into develop	2023-09-01 15:33:39 +03: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	fix backup upload handler	2023-08-25 12:51:15 +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
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
thumb.test.json
urlshortener.test.json