Commit Graph

10303 Commits

Author SHA1 Message Date
c8925cbb8b Web: Files: Fixed warnings on Chrome DevTools 2021-01-18 16:49:29 +03:00
a5882a04ee Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-18 16:05:27 +03:00
fa2aef8e35 Files: fixed upload 2021-01-18 15:45:27 +03:00
e2c68dd09e Web: Files: fixed update thirdparty folders 2021-01-18 15:32:21 +03:00
88f37bdfc6
Merge branch 'develop' into feature/multi-stage-docker-env 2021-01-18 15:25:45 +03:00
Sergey Kirichenko
525654fdef Correct spelling 2021-01-18 15:09:43 +03:00
445d2886b8 Web: Files: fixed empty screens for files 2021-01-18 14:43:22 +03:00
30ccd43252 Web: Added Enter handler 2021-01-18 13:22:23 +03:00
6a2545656b Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-18 12:56:04 +03:00
TatianaLopaeva
a4f416789a Merge branch 'develop' into feature/fix-hide/show-header 2021-01-18 12:02:40 +03:00
83368921d3 web: common: bump version 2021-01-18 12:02:15 +03:00
22234fe957 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-18 12:01:51 +03:00
35be26204c Web: Common: fixed SettingsFilesLoader width 2021-01-18 12:01:36 +03:00
781386bd63 Files: fix deserialization 2021-01-18 11:59:17 +03:00
7c5ea61c2f Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-18 11:56:10 +03:00
4917fcdc71 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-18 11:38:21 +03:00
6ec1e8baf0 Web: Files: fixed thirdparty loader 2021-01-18 11:38:14 +03:00
c6072b3c52 Thirdparty: fixed scope 2021-01-18 11:06:40 +03:00
f5179cd9f9 Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-18 11:05:47 +03:00
b89b73f823 Web: Files: Changed base modal container 2021-01-18 11:05:32 +03:00
Artem Tarasov
d965160918 Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/index.js
2021-01-18 10:49:49 +03:00
a342e661aa Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-15 19:19:57 +03:00
738e834345 Web: Files: fixed onClose service connection dialog 2021-01-15 19:19:48 +03:00
Artem Tarasov
f5a1225d8d Web: Files: Settings: fixed loader display when switching from the settings tree 2021-01-15 19:10:44 +03:00
cb1b62d1c0 Web: Files: added error border 2021-01-15 18:41:30 +03:00
e78899e63f Web: Files: fixed display of errors 2021-01-15 18:37:17 +03:00
7de7d6ea5e Web: Files: fixed setIsLoading after connection thirdparty 2021-01-15 18:24:55 +03:00
56614a4880 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-15 18:19:42 +03:00
e70211e071 Web: Files: fixed setErrorText 2021-01-15 18:18:42 +03:00
442d61690f Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-15 18:15:16 +03:00
ef22eb04c5 Web: Client: Fix third-party response page displaying 2021-01-15 18:15:07 +03:00
e23dcb1556 Web: Files: fixed display of thirdparty folders 2021-01-15 18:11:06 +03:00
TatianaLopaeva
f14f83d1a1 Web: People/Files: Refactoring. 2021-01-15 17:55:18 +03:00
TatianaLopaeva
26c680010a Web: Common/People: Deleted useless imports. 2021-01-15 17:50:30 +03:00
TatianaLopaeva
f869209eee Web: Common: Fixed automatic scrolling down after loading the page. 2021-01-15 17:48:05 +03:00
4043f55849 Web: Files: added isLoading for thirdparty save button 2021-01-15 17:44:19 +03:00
096c8182a9 Web: Files: added isRequired to thirdparty fields 2021-01-15 17:39:58 +03:00
3b217411bf Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-15 17:35:23 +03:00
ca0e16adfa Web: Files: added error notification for thirdparty connection, removed route after connection 2021-01-15 17:35:14 +03:00
TatianaLopaeva
73b2ee6df8 Web: Common/People: Deleted useless imports. 2021-01-15 17:13:02 +03:00
TatianaLopaeva
13a0f63678 Web: Common: Fixed automatic scrolling down after loading the page. 2021-01-15 17:01:35 +03:00
Ilya Oleshko
8f3b4a60dd Web: Files: Added ThirdPartyResponse page error container, fixed router 2021-01-15 16:28:08 +03:00
TatianaLopaeva
f7fbbceeb6 Web: Common: Layout: Set height to 100% for mobile. 2021-01-15 16:05:54 +03:00
TatianaLopaeva
acbfd88658 Web: Common: Layout: Fixed issue with title not displaying when scrolling up. Fixed the disappearance of the header only if you can make the scroll larger than the width of the header and section header. 2021-01-15 16:04:34 +03:00
TatianaLopaeva
31d053bc13 Web: Common: Fixed the issue of not scrolling horizontally (touchpad). 2021-01-15 14:41:44 +03:00
0f96dcfeb4 Files: fix copy thirdparty folder 2021-01-15 14:08:05 +03:00
90f81df4c7 Merge branch 'develop' into feature/thirdparty-integrations 2021-01-15 13:39:31 +03:00
Vladislav Makhov
429fa91ced Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-15 13:37:03 +03:00
Vladislav Makhov
83557dc329 web: files: remove unnecessary code 2021-01-15 13:36:39 +03:00
Vladislav Makhov
3b1c0fc530 web: files: fix opening common folder 2021-01-15 13:34:02 +03:00