Commit Graph

20005 Commits

Author SHA1 Message Date
6c45bb0632 Merge branch 'develop' into feature/docspace 2022-05-17 11:50:56 +03:00
9ed3b1cb2f fix tests 2022-05-16 13:58:45 +03:00
4840b42277
Merge pull request #640 from ONLYOFFICE/feature/fix-tests
Feature/fix tests
2022-05-16 12:57:25 +03:00
f4727b411e Test: fix 2022-05-13 18:08:30 +03:00
14f25c2da7 Test: fix 2022-05-13 14:48:51 +03:00
969c037d3c Merge branch 'develop' into feature/fix-tests 2022-05-13 12:27:30 +03:00
08e926ca0e
Merge pull request #625 from ONLYOFFICE/feature/SSO-new
Feature/sso-new
2022-05-13 11:54:06 +03:00
411e3b7f58 Sso: fix 2022-05-13 11:52:49 +03:00
87a7a1089c Merge branch 'develop' into feature/SSO-new 2022-05-12 19:37:24 +03:00
Eugene Kozyrev
4929c5f343
Upgrade ZooKeeper version to 3.7.1 in Windows installation (#637)
* Upgrade ZooKeeper version to 3.7.1

* Add versions variables
2022-05-12 19:06:09 +03:00
Vashchuk Nikita
44cf5d7f80 fix 2022-04-29 18:25:49 +03:00
84121f4451 fix 2022-04-29 17:26:21 +03:00
07909736c3 Merge branch 'develop' into feature/docspace 2022-04-29 16:49:18 +03:00
cf0e9c322d ElasticSearch: fix 2022-04-29 16:17:52 +03:00
Vashchuk Nikita
fd472da6bc added JsonPropertyName 2022-04-29 14:56:40 +03:00
373e66d35d Files: added DocSpaceHelper 2022-04-29 14:15:42 +03:00
3d2c055551 Files: added audit for room 2022-04-29 14:15:22 +03:00
31c289a26b fix-tests: change dir for log and products 2022-04-29 13:48:29 +03:00
Vashchuk Nikita
b8ed834eba fix 2022-04-29 10:49:56 +03:00
868c2e18b2 Files: added Editing share 2022-04-28 19:38:26 +03:00
4a773679e1 fix-tests: rework files tests
-rework tests (use httpClient)
-fix migration
-add description
-union similar tests
-add random port for asc.Files
-add time to db name
-change TestCaseSource to TestCase
2022-04-28 18:55:41 +03:00
Vashchuk Nikita
f39a476d06 added SsoController, fix 2022-04-28 16:56:12 +03:00
2efbdddf15 Files: fix 2022-04-28 16:00:05 +03:00
Vashchuk Nikita
442a6bb30a Merge branch 'develop' into feature/SSO-new
# Conflicts:
#	config/nginx/onlyoffice.conf
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Studio/Startup.cs
2022-04-28 15:45:11 +03:00
503672e6b2 Merge branch 'develop' into feature/docspace 2022-04-28 15:45:09 +03:00
b6fe254379 Files: docspace default enabled 2022-04-28 12:40:17 +03:00
e11fc2ff79 backend: updated packages version 2022-04-27 18:48:28 +03:00
36d914724d backend: updated packages version 2022-04-27 17:54:31 +03:00
93f637467b backend: updated packages version 2022-04-27 14:26:38 +03:00
19cf415898 backend: updated packages version 2022-04-27 13:02:17 +03:00
69da159039 Files: removed unnecessary 2022-04-26 17:07:32 +03:00
0ab3c53823 Files: changed sort 2022-04-26 15:53:06 +03:00
Vashchuk Nikita
258cf02d27 fix ssoHandler 2022-04-26 14:10:12 +03:00
Vashchuk Nikita
1431c5ec80 fix 2022-04-26 12:27:12 +03:00
Vashchuk Nikita
e812d3ec53 fix 2022-04-26 11:49:55 +03:00
2863e167c6 Files: fix 2022-04-26 02:15:32 +03:00
3d9e9eb94f Files: refactor 2022-04-26 02:14:32 +03:00
35eb164fbe Files: added usings 2022-04-26 02:14:17 +03:00
05ce39f359 Files: added area filter value, removed unnecessary 2022-04-26 02:14:06 +03:00
ff87612892 Files: added generic methods for virtual rooms 2022-04-26 02:13:30 +03:00
33d2f638ad Files: added area filter 2022-04-26 02:13:05 +03:00
46b02d6b27 Files: added new variable 2022-04-26 02:12:44 +03:00
d38257f704 Files: redesigned virtual rooms getting method, removed unnecessary 2022-04-26 02:12:27 +03:00
47e4be2d28 Files: added filtres for rooms 2022-04-26 02:11:02 +03:00
Vashchuk Nikita
62c66e6e1f Merge branch 'feature/SSO-new' of github.com:ONLYOFFICE/AppServer into feature/SSO-new 2022-04-25 21:42:36 +03:00
Vashchuk Nikita
422e87af13 added ssoHandler 2022-04-25 21:41:26 +03:00
dc939846c4
Merge pull request #632 from ONLYOFFICE/feature/backend-refactor
Feature/backend refactor
2022-04-25 16:03:27 +04:00
2a5aa715e4 fix tests 2022-04-25 11:09:51 +03:00
e38fcc1acb Files: refactor api, added query parameters 2022-04-25 00:08:01 +03:00
88b59b1c30 refactoring 2022-04-22 16:24:54 +03:00