Commit Graph

2833 Commits

Author SHA1 Message Date
0845e6226a SocketIO: fix ipv4 2022-11-14 18:00:16 +03:00
7581ba7234
Merge pull request #1029 from ONLYOFFICE/feature/fix-apisystem-SendCongratulations
fix SendCongratulations
2022-11-14 12:50:24 +03:00
e58ade423f
Merge pull request #1026 from ONLYOFFICE/feature/node-v18
Feature/node v18
2022-11-11 15:59:18 +03:00
e0ee5562e5 fix SendCongratulations 2022-11-11 11:53:11 +03:00
2314dce176 fix apisystem 2022-11-10 18:07:11 +03:00
8636aecf06 Update yarn.lock 2022-11-10 17:41:49 +03:00
6537a2c7e6 add logs 2022-11-10 14:04:58 +03:00
b999f6dbc5 fix PasswordChange 2022-11-09 20:26:59 +03:00
f034f1279f fixed AppName 2022-11-09 14:31:22 +03:00
bfa927fcf8 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2022-11-08 15:38:04 +03:00
991620468d change format logs for CloudWatch 2022-11-08 15:37:52 +03:00
24829b5d9e Audit: fix 2022-11-08 13:38:33 +03:00
c3c19aba39 fix migration 2022-11-07 13:43:49 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
14a64f4ad0 Merge branch 'develop' into feature/remove-waste
# Conflicts:
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Program.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	products/ASC.CRM/Server/Classes/Global.cs
#	products/ASC.Files/Server/ProductEntryPoint.cs
#	web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
4182594d86 healthcheck: changed default timeout 2022-11-03 19:23:11 +03:00
3a9fc421c8 ASC.WePlugins: added support CloudWatch 2022-11-03 15:09:24 +03:00
2f2b1dcf12 ASC.WebDav: added support CloudWatch 2022-11-03 14:40:05 +03:00
68e3f26d90 ASC.UrlShortener: added support CloudWatch 2022-11-03 14:37:17 +03:00
41ad5643ec ASC.SsoAuth: added support CloudWatch 2022-11-03 14:33:36 +03:00
59133b122e ASC.Socket.IO: added support CloudWatch 2022-11-03 14:26:07 +03:00
30fa1816f6 add logs 2022-11-03 13:27:41 +03:00
e5393096a7
Merge pull request #972 from ONLYOFFICE/bugfix/rooms
Bugfix/rooms
2022-11-02 19:05:17 +03:00
34bda20eb0 Merge branch 'develop' into feature/recalculate-user-quota
# Conflicts:
#	products/ASC.People/Server/Api/UserController.cs
2022-11-02 13:40:53 +03:00
cec0473d1b Merge branch 'develop' into feature/letters
# Conflicts:
#	web/ASC.Web.Core/Notify/Actions.cs
#	web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
2022-11-02 13:25:49 +03:00
d6656b0aa9
Merge pull request #968 from ONLYOFFICE/feature/delete-cultureMiddleware-from-api-system
Feature/delete culture middleware from api system
2022-11-02 11:55:17 +03:00
097ce33ea6 ASC.Socket.IO: added yarn.lock 2022-11-02 11:14:01 +03:00
434a34c021 Merge branch 'develop' into bugfix/rooms 2022-11-02 10:48:26 +03:00
ac46060c96 Merge branch 'develop' into feature/delete-cultureMiddleware-from-api-system 2022-11-01 15:17:21 +03:00
d450457703 removed unnecessary call when inviting a user that reduces performance 2022-11-01 14:06:31 +03:00
46fa46b9e3 ASC.Socket.IO: support CloudWatch transport for winston logger 2022-11-01 12:54:14 +03:00
793daf52d3 delete cultureMiddleware from api system 2022-10-31 17:26:07 +03:00
52b23cbf8b healthcheck: added to ApiSystem/ClearEvents services. refactoring 2022-10-31 16:13:45 +03:00
7a01578f0c
Merge pull request #939 from ONLYOFFICE/feature/remove-new-TenantQuotaController
remove  "new TenantQuotaController"
2022-10-31 13:03:28 +03:00
81b298cf72 fix 2022-10-31 13:03:02 +03:00
556c0b8041 People: renamed IsDocSpaceAdmin to IsAdmin 2022-10-28 16:23:41 +03:00
0baa36c1c0 GetDataStore tenant string to int 2022-10-28 15:23:51 +03:00
fa24e98df6 fix IpSecurityFilter 2022-10-28 10:58:13 +03:00
e72349ae16 restore files 2022-10-28 10:48:46 +03:00
86daa32280 People: fix 2022-10-28 10:34:03 +03:00
78bd9f0e13 Merge branch 'develop' into feature/invite-accounts 2022-10-27 19:18:07 +03:00
342343a1e1
Merge pull request #925 from ONLYOFFICE/feature/rights-rework
Feature/rights rework
2022-10-27 19:59:03 +04:00
35daece00c fix asc.data.storage.encryption 2022-10-27 15:54:52 +03:00
fa9dd5bd94 rename singnalR to socket 2022-10-27 15:37:26 +03:00
d54a2fc79e rename file 2022-10-27 15:33:06 +03:00
eb485d035a Api.Core: added employee type 2022-10-26 17:38:47 +03:00
fe5385053c rebbitmq: split default queue on separate queue 2022-10-26 17:21:37 +03:00
37e52ea733 Core.Common: fix for invated users 2022-10-25 23:16:54 +03:00
22d800afcd Core.Common: added new type 2022-10-25 23:15:57 +03:00