Commit Graph

20024 Commits

Author SHA1 Message Date
dcc23ebbe5 Files: fix 2022-05-23 13:13:24 +03:00
5fa9c839e6 Files: fix 2022-05-23 12:29:14 +03:00
c9357da3b0 Files: added deleting tags, fix 2022-05-23 12:25:33 +03:00
7b6abe81a2 Files: added custom tags 2022-05-20 19:26:13 +03:00
2e33540486 Merge branch 'feature/docspace' into feature/docspace-links 2022-05-17 11:53:37 +03:00
6c45bb0632 Merge branch 'develop' into feature/docspace 2022-05-17 11:50:56 +03:00
92f5ccba89 fix 2022-05-17 11:49:25 +03:00
d2a8ebf771 added force save, refactor 2022-05-16 20:19:41 +03:00
1c4dacf66b added data for validation 2022-05-16 20:19:24 +03:00
0b92150d57 added data check, added audit 2022-05-16 20:19:02 +03:00
46e164d490 added config settings 2022-05-16 20:18:25 +03:00
693083a607 refactor 2022-05-16 20:18:15 +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
fbdef62782 fix audit 2022-05-15 23:19:11 +03:00
018e77258f added room inviting 2022-05-15 23:19:03 +03:00
b8ab214ad0 Api: added access 2022-05-15 18:33:42 +03:00
d820284491 Api: added query parsing 2022-05-15 18:13:23 +03:00
c7c1745528 People: changed dto 2022-05-15 18:12:51 +03:00
025d13557d added a secure link to invite to the portal 2022-05-13 19:25:28 +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
5d2946b47f Files: fix mapping 2022-05-11 17:16:23 +03:00
68f949f2e7 Files: added link generation 2022-05-05 15:31:04 +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