Commit Graph

2906 Commits

Author SHA1 Message Date
8e0bc0a732 Merge branch 'develop' into release/rc-v1.2.0 2022-12-02 19:56:43 +03:00
aa7c2f5b61 Update LocalesTest.cs
Fix translations tests for toast getTitle method
2022-12-02 16:52:49 +03:00
8b9f3a5c82 Update LocalesTest.cs
Fix detection of tKey translations
2022-12-02 16:30:24 +03:00
d401c06876 Translations tests refactoring 2022-12-02 15:56:52 +03:00
374e7f5915 add ASC.Migration.PersonalToDocspace for linux 2022-12-02 11:49:56 +03:00
d0deecda18 Update ASC.Migration.PersonalToDocspace.exe 2022-12-02 11:16:29 +03:00
12e800a8be remove waste 2022-12-02 11:07:16 +03:00
997b2547b5 remove waste 2022-12-02 11:01:00 +03:00
0b6000e200 Tests: Refactoring 2022-12-01 18:56:13 +03:00
9276cd9dfc Update LocalesTest.cs
Added support of typescript files
2022-12-01 13:48:43 +03:00
6923a767bd Fix run NotTranslatedCommonKeysTest on macos 2022-12-01 13:47:53 +03:00
9a2c392a96 Fix running tests on macos 2022-12-01 13:26:50 +03:00
5e253bb9c8 set region when start app 2022-11-30 19:03:44 +03:00
a44d24d86f Merge branch 'develop' into feature/migration_personal 2022-11-30 16:24:04 +03:00
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
4db7b76f6d refactoring 2022-11-29 17:05:43 +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
3068359636 refactoring 2022-11-29 16:38:44 +03:00
b9f45035b9 Merge branch 'release/rc-v1.2.0' into feature/migration_personal
# Conflicts:
#	common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
2022-11-29 13:07:12 +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
3b6eece8c7 add cache in DbFactory 2022-11-14 12:05:54 +03:00
d7c1787442 dbContext from regions 2022-11-13 00:44:57 +03:00
e58ade423f
Merge pull request #1026 from ONLYOFFICE/feature/node-v18
Feature/node v18
2022-11-11 15:59:18 +03:00
aa0222f078 Merge branch 'develop' into feature/migration_personal 2022-11-11 15:05:26 +03:00
e0ee5562e5 fix SendCongratulations 2022-11-11 11:53:11 +03:00