Commit Graph

431 Commits

Author SHA1 Message Date
014e344bb6 Socket.svc: Restored kill process on node died 2022-02-03 19:12:29 +03:00
00bb2821bc Socket.svc: Restored logPath Environment 2022-02-03 18:57:26 +03:00
b25f339c3e Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-24 15:43:04 +03:00
8863e41487 Elastic: fix ping 2022-01-21 13:56:23 +03:00
dd2c54ed86 Elastic: fix ping 2022-01-21 11:42:48 +03:00
bd8c47ff5d Web: Socket.IO: Update SocketIOClient 2022-01-20 10:44:20 +03:00
1a8d88345a Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
#	yarn.lock
2022-01-17 19:02:40 +03:00
a66272af1a Elastic: fix ping 2022-01-14 15:20:44 +03:00
078e870f71 Web: Socket.IO: Fix reboot, logging, + refactoring (replaced WebSocketSharp to SocketIOClient) 2022-01-11 19:09:44 +03:00
6cbd02b71c Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/webpack.config.js
#	products/ASC.Files/Server/DocStore
#	yarn.lock
2022-01-10 11:06:32 +03:00
99e37d960d Web: Socket.IO: Refactoring work with socket.io 2021-12-20 15:38:08 +03:00
fbdb776d69 fix 2021-11-29 14:34:35 +03:00
85316c9d63 Moved from 45122194 2021-11-29 14:11:03 +03:00
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00
1bc64ce5ae Files: check state before get stream 2021-09-30 09:51:38 +03:00
d099326e7f Merge branch 'develop' into feature/backup.core
# Conflicts:
#	common/services/ASC.Data.Backup/Program.cs
2021-09-05 12:50:05 +03:00
9cb01be544 Elastic: removed unused isInit 2021-09-03 18:05:05 +03:00
d78195aa5a Added notify 2021-09-03 18:04:06 +03:00
c5b135afbe backup.core: remove waste 2021-09-02 16:11:41 +03:00
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00
d8654444c6 backup.core: fix 2021-08-31 16:59:32 +03:00
115d752582 backup.core: fix 2021-08-31 15:43:40 +03:00
a812971c07 Merge branch 'develop' into feature/backup.core 2021-08-31 13:55:47 +03:00
4b3cb1b4fb backup.core: first version 2021-08-31 12:40:28 +03:00
a84bddad3c fix 2021-08-30 19:17:57 +03:00
e5faa90adb removed nuget warnings 2021-08-20 16:53:27 +03:00
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
2021-08-12 15:00:53 +03:00
87b7e171de ApiSystem: fix 2021-08-11 21:32:43 +03:00
643b7b66dc Optimization: removed autofac ILifetimeScope 2021-08-10 17:56:38 +03:00
39f77c5352 Backup: fix 2021-08-10 11:36:07 +03:00
546c1872a3 Added asp logging 2021-08-08 16:19:54 +03:00
672de09a90 NLog: up to 4.7.10 2021-08-08 15:55:27 +03:00
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
e86124cbdd Elastic: fixed search by content 2021-08-04 13:08:12 +03:00
6fbdaf0d31 Calendar: post-merge fixes 2021-07-27 16:09:30 +03:00
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
913c67a818 Elastic: fixed create scope 2021-07-22 12:11:39 +03:00
8c78fa4a17 Feed: fix TenantManager 2021-07-22 11:56:52 +03:00
2d75554b0d DbContext: optimization 2021-07-15 13:07:47 +03:00
b184ad7898 Log: fix configuring 2021-07-14 11:00:59 +03:00
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
d59f9a2aa2 fixed urls 2021-06-23 20:12:50 +03:00
0e6078f9e2 Merge branch 'develop' into feature/ClearEvents
# Conflicts:
#	ASC.Web.sln
2021-06-23 17:15:56 +03:00
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
c18adc50dc ClearEvents: fixed log and launch 2021-06-23 15:25:17 +03:00
d8abde6d88 SSoAuth: fix buid and run 2021-06-22 19:44:09 +03:00
912501a2f4 Healthcheck: fix apisystem 2021-06-22 19:09:24 +03:00
00cc15fbf5 Merge branch 'develop' into feature/ClearEvents 2021-06-18 12:21:54 +03:00