Commit Graph

9794 Commits

Author SHA1 Message Date
34ab7983b7 Web: Files: fixed thirdparty edit 2021-01-13 17:29:24 +03:00
Viktor Fomin
4d60745a11 Web: Files: fixed undefined customer title 2021-01-13 16:32:13 +03:00
f3a2162537 Web: Files: added context menu to connection clouds 2021-01-13 14:17:45 +03:00
a41b774fe8 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-13 13:42:26 +03:00
c5ebea42de Web: Files: fixed getIsThirdPartySelection selector 2021-01-13 13:42:18 +03:00
Artem Tarasov
b239b7304f Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-13 12:54:03 +03:00
Artem Tarasov
7176819acc Web: Files: thirdParty: fixed service connection and window closing after connection 2021-01-13 12:53:46 +03:00
Vladislav Makhov
1895cf45df web: client: fix folder title in modal 2021-01-13 12:40:52 +03:00
Vladislav Makhov
73ef78f465 Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-13 11:43:55 +03:00
Vladislav Makhov
e6e6a6e2dd web: client: fix node selection 2021-01-13 11:43:42 +03:00
993dfbf53d Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-13 11:40:24 +03:00
b05a809a32 Files: fix API SetAceLink for third-party 2021-01-13 11:40:11 +03:00
Vladislav Makhov
7289f53628 web: common: bump version 2021-01-13 11:27:59 +03:00
Vladislav Makhov
754ae6713d web: common: fix link 2021-01-13 11:27:41 +03:00
857b90e371 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations 2021-01-13 10:32:33 +03:00
52fc96fa25 Web: Files: fixed copying service folders 2021-01-13 10:31:52 +03:00
Artem Tarasov
173d8195fb Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-12 17:27:43 +03:00
Artem Tarasov
9e9cf3face web: components: bump version 2021-01-12 17:27:26 +03:00
Artem Tarasov
9df05a53c9 Web: Components: ModalDialog: fixed cursor type in modal 2021-01-12 17:27:03 +03:00
d14f3d951a Web: Files: fixed thirdparty connection folder name 2021-01-12 16:48:50 +03:00
5a80d1c756 Web: Files: fixed move operation for thirdparty folders 2021-01-12 16:35:55 +03:00
9f9a517f92 Web: Files: fixed display of service folders for tree folders 2021-01-12 15:12:08 +03:00
Ilya Oleshko
3cfeb2e5ed Web: Files: Fixed open oAuth modal 2021-01-12 13:51:41 +03:00
Artem Tarasov
adc795feb4 Web: Client: thirdPartySettings: changed the cursor to default 2021-01-12 13:24:44 +03:00
Vladislav Makhov
b37b9f3292 Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-12 12:09:02 +03:00
Vladislav Makhov
69e56c9337 web: client: fix outline border 2021-01-12 12:08:48 +03:00
Vladislav Makhov
70e406d77e web: client: fix open location of added provider 2021-01-12 12:07:39 +03:00
Ilya Oleshko
80bf09b5d8 Web: Files : Article: Returned expanded icon for common folder 2021-01-12 11:33:02 +03:00
b149a5f3a5 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations 2021-01-12 09:49:04 +03:00
Artem Tarasov
fddae00ffd Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-12 09:49:54 +03:00
Artem Tarasov
28c93bc32d Web: Files: Settings: removed unknown symbol in the window for adding a new account. 2021-01-12 09:49:24 +03:00
4aae74ed48 Web: Files: fixed files operations 2021-01-12 09:48:55 +03:00
Vladislav Makhov
7ad7d4556e web: common: fix links in tpi settings 2021-01-12 09:27:04 +03:00
Vladislav Makhov
745bd8be2c web: common: bump version 2021-01-12 09:25:42 +03:00
f66060fff1 Web: Files: Added new events handlers for DocsAPI SDK 2021-01-11 14:34:45 +03:00
9767111de3 Web: Files: fixed thirdparty route 2021-01-11 13:34:29 +03:00
ebaf9ccecd Web: Files: fix merge 2021-01-11 13:24:07 +03:00
5489d74b27 Web: Files: fixed getFilesList selector 2021-01-11 13:03:58 +03:00
328afa8111 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
# Conflicts:
#	products/ASC.Files/Client/src/store/files/selectors.js
2021-01-11 12:41:28 +03:00
c7c9225923 Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2021-01-11 12:37:31 +03:00
60022bbc06 Update yarn.lock files 2020-12-30 21:33:07 +03:00
1ca1fb5bac
Merge pull request #167 from ONLYOFFICE/feature/desktop-view
Feature/desktop view
2020-12-30 20:20:21 +03:00
Vladislav Makhov
1f8769cd6b Update yarn.lock 2020-12-30 19:51:17 +03:00
Vladislav Makhov
d87f9d0864 web: common: bump version 2020-12-30 19:45:24 +03:00
Vladislav Makhov
b2c6669e42 web: components: bump version 2020-12-30 19:45:01 +03:00
f40b347289
Merge branch 'develop' into feature/desktop-view 2020-12-30 19:42:59 +03:00
9e5a39c78e Remove useless code 2020-12-30 19:29:47 +03:00
8b42c104a8 Fix group button menu on tablet at desktop 2020-12-30 19:29:18 +03:00
4e938572b8 Fix displaying privacy shield icon 2020-12-30 19:06:26 +03:00
fc55550521
Merge pull request #166 from ONLYOFFICE/feature/asc-files-tests
Feature/asc files tests
2020-12-30 18:03:11 +03:00