Commit Graph

8228 Commits

Author SHA1 Message Date
Ilya Oleshko
60286af94f Web: Files : Selectors : Added providerItem selector for render services folders 2020-11-10 11:41:42 +03:00
Ilya Oleshko
6c0c32420a Merge branch 'develop' into feature/thirdparty-integrations 2020-11-10 11:11:09 +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
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
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +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
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
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
e9b5992600 Fix PrivacyRoomController 2020-11-05 18:42:23 +03:00
5a959892ae
Merge pull request #114 from ONLYOFFICE/feature/connect-controlPanel
Feature/connect control panel
2020-11-03 21:14:44 +03:00
8cfbf8cc7f Api: fix attachments 2020-11-03 18:16:23 +03:00
790d2fc934 Restore: fix 2020-11-03 16:02:54 +03:00
8eeb2b3375 Nginx: fix files/thirdparty/capabilities 2020-11-03 12:23:17 +03:00
450184f51c Merge branch 'develop' into feature/connect-controlPanel 2020-11-03 11:48:52 +03:00
78b2dc4631 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-11-03 11:47:16 +03:00
f39d6e83b8 Files: refactoring 2020-11-03 11:47:05 +03:00
60e66c1abe Web: Fixed PWA App icon url on iOS 2020-11-02 21:42:53 +03:00
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
c9a32c05dc Merge branch 'develop' into feature/connect-controlPanel
# Conflicts:
#	web/ASC.Web.Api/Controllers/PortalController.cs
2020-11-02 13:56:52 +03:00
b0b4f91eac CustomNamingPeople: fix 2020-11-02 13:35:08 +03:00
10d21caf30
Merge pull request #116 from ONLYOFFICE/bugfix/nginx-config
Bugfix/nginx config
2020-11-02 13:32:16 +03:00
3075fc59d3 Merge branch 'develop' into bugfix/nginx-config 2020-11-02 13:22:18 +03:00
d1d01254a8 nginx: fix 2020-11-02 12:18:14 +03:00
203f32951f
Merge pull request #115 from ONLYOFFICE/feature/article-resize
Feature/article resize
2020-11-02 12:03:50 +03:00
42b7b93832
Merge branch 'develop' into feature/article-resize 2020-11-02 11:44:08 +03:00
2ae201ebbd Files: privacy 2020-11-02 11:29:01 +03:00
SuhorukovAnton
08a25a903e Merge branch 'develop' into bugfix/nginx-config 2020-11-02 11:17:31 +03:00
52f1ea68a1 /api/2.0/authentication: application/x-www-form-urlencoded 2020-11-01 17:14:20 +03:00
ab8c6c6a81 Added · api/2.0/portal/mobile/registration 2020-11-01 14:58:43 +03:00
6baeee6ddd Files: fix startediting 2020-10-31 18:14:37 +03:00
e01182be70 Added /api/2.0/capabilities.json 2020-10-31 17:11:45 +03:00
1278b2abb5 Notify: fix 2020-10-30 20:51:01 +03:00
6cdab3daca Notify: fix 2020-10-30 18:42:56 +03:00
49dd924dc4 Notify: fix 2020-10-30 18:17:11 +03:00
4056ea888a Notify: fix urls 2020-10-30 17:57:31 +03:00
08b9db919e Merge branch 'feature/article-resize' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/article-resize 2020-10-30 17:23:06 +03:00
440395d341 Web: Common: fixed update main height timeout 2020-10-30 17:22:49 +03:00
Ilya Oleshko
7726e17170 Merge branch 'develop' into feature/article-resize 2020-10-30 15:32:25 +03:00
Ilya Oleshko
a823763af7 Web: Files : Body : RowContent : Fixed badges actions and styles 2020-10-30 15:20:06 +03:00
Ilya Oleshko
fa5cf43fa8 web: components: bump version 2020-10-30 14:25:33 +03:00
Ilya Oleshko
bf879ce810 web: common: bump version 2020-10-30 14:25:22 +03:00
Ilya Oleshko
b1b402768b Web: Files : Body : Added context to RowContainer 2020-10-30 14:25:04 +03:00
Ilya Oleshko
797afe5c72 Web: Common: changed ReactResizeDetector refreshRate 2020-10-30 14:24:24 +03:00