Commit Graph

2869 Commits

Author SHA1 Message Date
3a927973e3
Merge pull request #1018 from ONLYOFFICE/feature/users-payments-filter
Feature/users payments filter
2022-11-29 23:31:37 +04:00
bacde66b72 Merge branch 'develop' into feature/users-payments-filter 2022-11-29 22:24:50 +03:00
baedfcc93a fixed performance issue 2022-11-29 16:47:26 +03:00
caa2143203 asc.data.backup: upgrade mysql.data.dll 2022-11-29 16:43:22 +03:00
78bbd45fdc DI: optimization 2022-11-25 17:00:49 +03:00
18b89b1517 nlog: fixed 2022-11-24 19:18:27 +03:00
db7dffe624 refactoring 2022-11-24 17:22:34 +03:00
8d421a3b24 refactoring 2022-11-24 17:21:34 +03:00
ee04a7a55c removed unused dependencies 2022-11-24 14:40:13 +03:00
0d65c0dccf revert 2022-11-23 18:54:59 +03:00
284c329f70 Core: autodetect mysql version 2022-11-23 18:45:33 +03:00
2b9446dc26 fix startup 2022-11-23 12:17:08 +03:00
5582353715 Update portalManager.js
Commented wrong portalInternalUrl
2022-11-22 14:44:59 +03:00
9453c6cd77 Added more logs 2022-11-22 12:45:51 +03:00
bf89726fbc fix nconf 2022-11-17 14:56:04 +03:00
2f7fdaf00a
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo
Feature/remove .wait and .result
2022-11-16 18:24:29 +03:00
dcfde7df07 common settings for configure aws cloudwatch credentials 2022-11-16 17:18:58 +03:00
e50833f7f3 common settings for configure aws cloudwatch credentials 2022-11-16 12:44:53 +03:00
0fb1e343a5 fix 2022-11-16 11:34:21 +03:00
ca5e0e4d1e fix 2022-11-16 11:18:24 +03:00
e5863dddcc fix 2022-11-15 17:07:51 +03:00
e17ef78c00 fix 2022-11-15 14:22:53 +03:00
56ad3d2287 fix 2022-11-15 13:53:53 +03:00
61b401d906 fix 2022-11-15 13:28:25 +03:00
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
7047c030d7 Merge branch 'develop' into feature/users-payments-filter 2022-11-14 12:29:47 +03:00
629f44b2f2 Core: added sorting users by type 2022-11-14 12:17:33 +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
7e633c8e70 Core: added payments filter 2022-11-10 17:13:33 +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
789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Core/FilesModule.cs
#	products/ASC.Files/Service/Core/FoldersModule.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +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