Commit Graph

8335 Commits

Author SHA1 Message Date
Ilya Oleshko
cf5573c74b Web: Files : Settings : Fixed style of input 2020-11-10 16:30:22 +03:00
a1541da672 Web: Files: added thirdParty icons 2020-11-10 15:12:14 +03:00
7e5c9beb73 Web: Components: added thirdParty icons 2020-11-10 15:10:57 +03:00
9b10dd39ee Merge branch 'develop' into feature/thirdparty-integrations 2020-11-10 12:59:40 +03:00
fa2a510a8a Web: Files: added thirdParty api, added new thirdParty dialogs 2020-11-10 12:50:07 +03:00
1da1cde38e Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations 2020-11-10 12:29:57 +03:00
Ilya Oleshko
ecefe5c859 Web: Files : Body : Fixed render for services folder 2020-11-10 11:43:05 +03:00
Ilya Oleshko
60286af94f Web: Files : Selectors : Added providerItem selector for render services folders 2020-11-10 11:41:42 +03:00
4458bca039 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-11-10 11:21:34 +03:00
6947185bab Files: refactoring 2020-11-10 11:21:22 +03:00
Ilya Oleshko
6c0c32420a Merge branch 'develop' into feature/thirdparty-integrations 2020-11-10 11:11:09 +03:00
ccf8eb8e59
Merge pull request #118 from ONLYOFFICE/feature/third-party-settings
Feature/third party settings
2020-11-10 10:51:01 +03:00
Vladislav Makhov
9cc469a51c Merge branch 'develop' into feature/third-party-settings 2020-11-10 08:39:33 +03:00
Vladislav Makhov
633a5415c0 Fix url 2020-11-10 08:14:56 +03:00
Ilya Oleshko
d169eeac26
Merge pull request #121 from ONLYOFFICE/feature/creating-redirect
Feature/creating redirect
2020-11-09 19:01:46 +03:00
Vladislav Makhov
0df2b1e956 web: common: bump version 2020-11-09 18:48:08 +03:00
Ilya Oleshko
3411513117 web: common: bump version 2020-11-09 18:31:13 +03:00
Ilya Oleshko
b16448bea3 Web: Common: Article: Fixed after merge 2020-11-09 18:30:57 +03:00
Ilya Oleshko
82a2520150 Web: Files : Body : Fixed preload tab for new documents 2020-11-09 18:29:06 +03:00
3c38343063 Fix download.
fix thirdparty
2020-11-09 17:46:49 +03:00
Vladislav Makhov
982fbdd593 Merge branch 'develop' into feature/third-party-settings 2020-11-09 16:44:18 +03:00
Vladislav Makhov
21234d6a39 Remove unused data 2020-11-09 16:24:32 +03:00
Vladislav Makhov
078bb238fd Add url to store 2020-11-09 16:15:36 +03:00
cb9e450f52 Web: Files: removed useless operationsPanelProps 2020-11-09 16:11:56 +03:00
Vladislav Makhov
7c6d5a9e54 Add translation 2020-11-09 15:58:58 +03:00
Vladislav Makhov
8ac2ad73d6 Fix title 2020-11-09 15:31:24 +03:00
Vladislav Makhov
cdaa816b36 Fix Help center link 2020-11-09 15:27:07 +03:00
Vladislav Makhov
fee439b390 Refactoring 2020-11-09 15:11:46 +03:00
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
Vladislav Makhov
eeced56986 Refactoring 2020-11-09 13:03:18 +03:00
Vladislav Makhov
430c7ae73d Remove unused code 2020-11-09 12:05:17 +03:00
Vladislav Makhov
d569e8dd74 Refactoring 2020-11-09 12:02:03 +03:00
Vladislav Makhov
102837ed04 Add selector 2020-11-09 09:16:44 +03:00
Vladislav Makhov
d4f2c16140 Merge branch 'feature/third-party-settings' of github.com:ONLYOFFICE/AppServer into feature/third-party-settings 2020-11-06 19:18:42 +03:00
Vladislav Makhov
6f38b66255 Add react-string-format lib 2020-11-06 19:18:32 +03:00
a984f9233d Merge branch 'develop' into feature/thirdparty-integrations 2020-11-06 18:23:59 +03:00
37fa37f473 Files: fix autofac 2020-11-06 17:54:48 +03:00
9d696b73f6 Revert "Fix resources"
This reverts commit ec0ace1f59.
2020-11-06 16:59:50 +03:00
ec0ace1f59 Fix resources 2020-11-06 16:32:37 +03:00
Vladislav Makhov
c9eeeed26e Add separator 2020-11-06 16:20:27 +03:00
Ilya Oleshko
d8c403f662 Merge branch 'develop' into feature/thirdparty-integrations 2020-11-06 15:30:35 +03:00
2250baf7b7 Thirdparty: fix 2020-11-06 15:10:27 +03:00
Vladislav Makhov
25c812937d Rename sendConsumerNewProps to updateConsumerProps 2020-11-06 14:29:55 +03:00
15134f2beb Web: Files: added setting thirdParty page with translations 2020-11-06 12:14:02 +03:00
8aad3dbc6f Web: Files: added new icons 2020-11-06 12:08:29 +03:00
3cf56b13ea Web: Common: added thirdparty api 2020-11-06 12:07:48 +03:00
Vladislav Makhov
265ed05414 Merge branch 'develop' into feature/third-party-settings 2020-11-05 19:19:50 +03:00
Vladislav Makhov
462c7578fb Moved declaration out from render 2020-11-05 18:56:45 +03:00
Vladislav Makhov
b777439f09 Change to decomposed prop consumer 2020-11-05 18:43:21 +03:00
e9b5992600 Fix PrivacyRoomController 2020-11-05 18:42:23 +03:00