Commit Graph

2913 Commits

Author SHA1 Message Date
965867e3f5 Merge branch 'develop' into feature/fix-whitelable 2022-12-12 17:22:03 +03:00
143a4d01ec removed unused variables 2022-12-09 17:47:46 +03:00
6e45bc5aa8 removed unused variables 2022-12-09 16:34:00 +03:00
e8e75dfa8a
Merge pull request #1110 from ONLYOFFICE/fix/tests
Fix/tests
2022-12-09 13:16:21 +03:00
ddd791096d Feed.Aggregator: changed socket client resolving 2022-12-09 12:38:02 +03:00
8d1393ba8e Core: changed singleton to scope 2022-12-09 12:23:26 +03:00
5e630feb68 Merge branch 'develop' into fix/tests 2022-12-08 19:46:44 +03:00
4fa41aa273 fixed updating ownerId 2022-12-08 18:50:50 +03:00
ea1f2ba1b7 Merge branch 'develop' into feature/socket-newtag 2022-12-07 16:16:59 +03:00
de46ba5203 fix test GlobalFilter 2022-12-07 14:25:45 +03:00
0e6d5405d2 fix web.api tests 2022-12-07 13:38:35 +03:00
7afc44abda fix webhooks tests 2022-12-07 13:38:35 +03:00
2ca007eb81 ApiSystem: cors 2022-12-07 12:34:14 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
Viktor Fomin
15ff7aa19d Merge branch 'develop' into feature/fix-whitelable 2022-12-06 16:50:55 +03:00
f5a16c7e64 Merge branch 'develop' into feature/socket-newtag 2022-12-05 15:55:26 +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
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
fbfd9daa46 Merge branch 'develop' into feature/socket-newtag 2022-11-30 18:37:34 +03:00
Viktor Fomin
8f97413d1d Merge branch 'develop' into feature/fix-whitelable 2022-11-30 12:33:31 +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
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
Viktor Fomin
366d92abb2 Merge branch 'develop' into feature/fix-whitelable 2022-11-28 12:09:11 +03:00
1b7844b44a Merge branch 'develop' into feature/socket-newtag 2022-11-25 17:17:31 +03:00
78bbd45fdc DI: optimization 2022-11-25 17:00:49 +03:00
e2e81982f9 SocketIO: new rooms and events 2022-11-25 12:42:15 +03:00
18b89b1517 nlog: fixed 2022-11-24 19:18:27 +03:00
130532927b Merge branch 'develop' into feature/socket-newtag 2022-11-24 17:56:32 +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
Viktor Fomin
1fb1228dbd Merge branch 'develop' into feature/fix-whitelable 2022-11-24 02:33:13 +05:00
0d65c0dccf revert 2022-11-23 18:54:59 +03:00
284c329f70 Core: autodetect mysql version 2022-11-23 18:45:33 +03:00
Viktor Fomin
fd181baae3 Merge branch 'develop' into feature/fix-whitelable 2022-11-23 15:01:42 +05:00
2b9446dc26 fix startup 2022-11-23 12:17:08 +03:00
Viktor Fomin
c2fb9f583e Merge branch 'develop' into feature/fix-whitelable 2022-11-23 04:36:46 +05:00
4b180094e8 Whitelabel: rename 2022-11-22 18:03:59 +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
ffe0fbde97 Cors: fix 2022-11-21 12:44:28 +03:00
1a3b5d9a2f fix cookie name 2022-11-18 18:40:56 +03:00
d1c0e79eee Get tenantDomain from origin 2022-11-18 17:17:50 +03:00