Commit Graph

3601 Commits

Author SHA1 Message Date
6f25123e50 Web: Files: fixed renaming of thirdparty folder 2021-01-14 13:23:30 +03:00
c6d4ff33b0 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-14 13:00:41 +03:00
44fd647f02 Web: Files: fixed rename folder 2021-01-14 13:00:32 +03:00
Vladislav Makhov
04ea490eec web: client: fix node margin 2021-01-14 12:50:16 +03:00
f2374ab669 Web: Files: fix opening links by url /Products/Files/DocEditor.aspx 2021-01-14 12:06:10 +03:00
77d7df2b0d Web: Files: fixed markasread files 2021-01-14 11:50:15 +03:00
47b5ff25ea Web: Files: Fix detecting doceditor page insensitive way 2021-01-14 11:39:36 +03:00
a1612a39c9 Web: Files: Added opportunity to open documents by old links 2021-01-14 11:02:31 +03:00
2848c39c57 Merge branch 'develop' into feature/thirdparty-integrations 2021-01-14 10:14:46 +03:00
576f473f4e Tags: fix 2021-01-13 19:09:05 +03:00
d63ab9910a Web: Files: fixed update service folders 2021-01-13 18:43:07 +03:00
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
144a86fca7 Files: fix Deserialize 2021-01-13 13:49:52 +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
ef686d78ac
Merge pull request #168 from ONLYOFFICE/features/jenkins-test
Jenkinsfile: run test
2021-01-13 13:31:46 +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
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +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
b05a809a32 Files: fix API SetAceLink for third-party 2021-01-13 11:40:11 +03:00
52fc96fa25 Web: Files: fixed copying service folders 2021-01-13 10:31:52 +03:00
60562d69a3 Files: test fix 2021-01-13 10:21:29 +03:00
a65aa18c17 Files: temp fix 2021-01-12 21:35:56 +03:00
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
19c9001082 Files: fix test 2021-01-12 18:32:05 +03:00
122048dd49 Files: temp fix 2021-01-12 18:27:56 +03:00
5289f92935 Files: temp fix 2021-01-12 18:01:38 +03:00
f21d81fe57 Files: fix long operations 2021-01-12 17:23:56 +03:00
Vladislav Makhov
7dc14d3688 web: client: fix recycle bin node style 2021-01-12 17:22:28 +03:00
d14f3d951a Web: Files: fixed thirdparty connection folder name 2021-01-12 16:48:50 +03:00
d118a9d5c8 Files: fix tests 2021-01-12 16:46:55 +03:00
5a80d1c756 Web: Files: fixed move operation for thirdparty folders 2021-01-12 16:35:55 +03:00
13cf5e5ad0 Files: tests. long operations 2021-01-12 16:00:05 +03:00
Vladislav Makhov
173cb950e7 web: client: fix switcher render 2021-01-12 15:27:35 +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
1b1d57ba35 Files: fix tests 2021-01-12 13:43:44 +03:00
682ca73a91 Files: fix tests 2021-01-12 13:16:11 +03:00
abaf8df8dc Files: test. Show error 2021-01-12 12:26:09 +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
5dbd0653f5 Files: test. fix order 2021-01-12 11:35:10 +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
84a6f19e15 Files: fix test 2021-01-11 22:03:11 +03:00
ac3f877a7c Files: fix test 2021-01-11 21:22:53 +03:00
9375dfd540 Files: fix test 2021-01-11 21:16:40 +03:00
441cf7e7cd Files: Test. Fix path 2021-01-11 20:50:17 +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
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
Vladislav Makhov
1f8769cd6b Update yarn.lock 2020-12-30 19:51:17 +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
95f0d03e11 Fix open new document on desktop 2020-12-30 17:56:38 +03:00
Vladislav Makhov
d47f53c775 Fix share button in private room 2020-12-30 17:34:23 +03:00
Vladislav Makhov
97837afaa6 Fix delete button in private room 2020-12-30 17:33:19 +03:00
Vladislav Makhov
44ba6f350f Merge branch 'develop' into feature/desktop-view 2020-12-30 16:20:47 +03:00
Vladislav Makhov
8cec798da7 Remove unused code 2020-12-30 16:17:09 +03:00
3bdd023006 Merge branch 'master' into develop 2020-12-30 14:54:44 +03:00
Vladislav Makhov
5bc3704ca5 Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	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/store/files/selectors.js
2020-12-30 13:11:54 +03:00
Ilya Oleshko
365596cb8c Web: Files : Fixed styles of new-files-panel for mobile 2020-12-30 12:37:48 +03:00
4dfd88daca Files: EncryptionKeysConfig->CryptoEngineId 2020-12-30 12:24:49 +03:00
Artem Tarasov
3a9f3b6e02 Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6 2020-12-30 12:16:26 +03:00
Artem Tarasov
b2317b3a06 Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6 2020-12-30 12:16:05 +03:00
Artem Tarasov
3d7eada1a6 Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation 2020-12-30 12:15:50 +03:00
Ilya Oleshko
5dea8f2409 Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6 2020-12-30 12:13:42 +03:00
Ilya Oleshko
065ae43f0a Web: People : Profile : Fixed autofocus on mobile 2020-12-30 12:13:33 +03:00
Vladislav Makhov
e2b7fecba5 Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6 2020-12-30 12:09:55 +03:00
Vladislav Makhov
27783eaee4 web: files: fix paging 2020-12-30 12:09:28 +03:00
8c8acc089a Web: Files: fixed dropdown in DownloadDialog 2020-12-30 12:07:55 +03:00
0fe23ef361 Merge branch 'develop' into feature/asc-files-tests 2020-12-30 11:48:26 +03:00
bf5781c2c0 fix startup 2020-12-29 19:45:18 +03:00
74aa0abca8 Bump version to v0.0.6 2020-12-29 19:43:37 +03:00
d54a5a0656 Added reqDesktop on DocEditor page 2020-12-29 18:43:12 +03:00
fa7c2bf9f1 Merge branch 'develop' into feature/asc-files-tests 2020-12-29 18:37:28 +03:00
7b4dc42620 Fix displaying header pre-loader on Desktop 2020-12-29 17:19:02 +03:00
058d905286 Merge branch 'develop' into feature/change-owner-panel 2020-12-29 16:27:43 +03:00
32d9331c7d Web: Files: fixed isCanShare selector 2020-12-29 16:22:24 +03:00
Vladislav Makhov
e6cf51575a Merge branch 'develop' into feature/desktop-view 2020-12-29 16:08:08 +03:00
1e69a3a416 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-12-29 16:05:02 +03:00
43bd3f6541 Files: openedit. EncryptionKeys 2020-12-29 16:04:50 +03:00
f5d9aca8c7 Merge branch 'develop' into feature/change-owner-panel 2020-12-29 15:41:56 +03:00
eeb0ab8779 Web: Files: fixed access selectors 2020-12-29 15:37:38 +03:00
39a0cb99de Update yarn.lock files 2020-12-29 14:03:05 +03:00