Commit Graph

2951 Commits

Author SHA1 Message Date
ffde2bf1c2 s3: fixed presigned url 2022-12-09 23:46:08 +03:00
7e52c309c1 Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 15:13:43 +03:00
e8e75dfa8a
Merge pull request #1110 from ONLYOFFICE/fix/tests
Fix/tests
2022-12-09 13:16:21 +03:00
153c68b3bd Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 13:05:08 +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
966364da9e Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 12:14:48 +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
cd0de88e6c Core.Common: fix getting user groups 2022-12-08 14:55:05 +03:00
4affc5f58f Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 18:50:14 +03:00
ce773b76bd rename appsettings in migration.sln 2022-12-07 17:28:40 +03:00
a03b50bd7c Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 16:20:29 +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
7d0cc5a396
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
Bugfix/room admin permissions
2022-12-06 15:22:47 +03:00
346c8d08e3 Core.Common: changed permissions validation logic 2022-12-06 01:57:45 +03:00
1596b4392b Core.Common: added rules matching support 2022-12-06 01:55:33 +03:00
3ee45f256b Core.Common: added new secuirty objects 2022-12-06 01:55:13 +03:00
6202e65932 Core.Common: added default rules 2022-12-06 01:54:35 +03:00
cd23ed5efc Core.Common: added rule 2022-12-06 01:54:18 +03:00
5e026445f5 Core.Common: added check for default rules 2022-12-06 01:49:57 +03:00
52f77ac06b Common: added interface IRuleData 2022-12-06 01:48:02 +03:00
f5a16c7e64 Merge branch 'develop' into feature/socket-newtag 2022-12-05 15:55:26 +03:00
28e2392e55 Core.Common: added clearing cache with user id 2022-12-05 14:06:42 +03:00
094e8d41ff Merge branch 'develop' into feature/room-admin-permissions 2022-12-05 11:15:15 +03:00
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
fbfd9daa46 Merge branch 'develop' into feature/socket-newtag 2022-11-30 18:37:34 +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