Commit Graph

1543 Commits

Author SHA1 Message Date
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
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
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
e6e6a6e2dd web: client: fix node selection 2021-01-13 11:43:42 +03:00
52fc96fa25 Web: Files: fixed copying service folders 2021-01-13 10:31:52 +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
5a80d1c756 Web: Files: fixed move operation for thirdparty folders 2021-01-12 16:35:55 +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
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
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
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
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
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
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
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
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
7b4dc42620 Fix displaying header pre-loader on Desktop 2020-12-29 17:19:02 +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
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
Vladislav Makhov
a4c4637453 Fix notification 2020-12-29 13:20:25 +03:00
e550726db8 Web: Files: added change owner to context menu 2020-12-29 09:42:41 +03:00
9d802dd929 Web: Files: update change owner panel styles 2020-12-29 09:41:29 +03:00
5a40792e9d Web: Files: added change owner panel actions, added import 2020-12-29 09:40:22 +03:00
6e58a4caa6 Web: Files: updated getFilesContextOptions selector 2020-12-29 09:36:40 +03:00
ceaf1c230a Web: Files: added ChangeOwnerPanel 2020-12-29 09:34:51 +03:00
f18d535cb1 Merge branch 'develop' into feature/upgrade-dependencies 2020-12-28 18:30:50 +03:00
Vladislav Makhov
d840506715 Fix desktop styles 2020-12-28 16:49:01 +03:00
Vladislav Makhov
737605b01e Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/locales/en/translation.json
#	products/ASC.Files/Client/src/components/panels/SharingPanel/locales/ru/translation.json
2020-12-28 11:34:26 +03:00
a21fff2ab1 Fix warning " > react-tooltip@3.11.6" has incorrect peer dependency "react@>=^16.0.0". 2020-12-28 11:04:34 +03:00
Vladislav Makhov
2ff0b2471d Add isEditor param to regDesktop 2020-12-28 10:40:50 +03:00
2be04b3bc0 Update package.json and yarn.lock files 2020-12-25 17:48:11 +03:00
d09bc13b93 Web: Files: fixed share translations 2020-12-25 17:00:09 +03:00
9f8ff83084 Update yarn.lock files 2020-12-25 16:24:26 +03:00
2b08c711dc Update Create-react-app to v4.0.1 2020-12-25 16:01:04 +03:00
b88d418d41 Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/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/pages/Settings/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Settings/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-12-25 15:27:44 +03:00
Vladislav Makhov
497b725a59 Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
2020-12-25 12:58:30 +03:00
25817f24ae Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-25 12:38:03 +03:00
20900eeb72 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-12-25 12:09:52 +03:00
644142b952 Web: Files: fixed link for Twitter and Facebook 2020-12-24 14:06:32 +03:00
9350f1189e Bump version to v0.0.5 2020-12-24 12:22:48 +03:00
1e234ed4aa Web: Files: moved getAccessIcon to selectors 2020-12-24 11:28:34 +03:00
Artem Tarasov
e4ae387718 Web: Files: VersionHistory: refactoring 2020-12-24 10:52:34 +03:00
9fbf5a5be5 Merge branch 'develop' into bugfix/sharing-panel-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
#	web/ASC.Web.Common/src/components/PeopleSelector/PeopleSelector.js
2020-12-24 10:52:01 +03:00
Vladislav Makhov
79989f7bf4 Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/MainButton/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
#	web/ASC.Web.Common/src/store/auth/actions.js
2020-12-24 10:21:02 +03:00
Artem Tarasov
5df8b7cc5b Web: Files: VersionHistory: Ver. added to translation 2020-12-24 10:15:50 +03:00
Artem Tarasov
465765338c Web: Files: versionHistory: fix after merge 2020-12-24 10:05:26 +03:00
Artem Tarasov
d756354ece Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
#	web/ASC.Web.Common/package.json
2020-12-24 09:47:22 +03:00
76d7ed6c73 Merge branch 'master' into develop
# Conflicts:
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-23 21:42:44 +03:00
Artem Tarasov
ae1a0cd8c1 Web: Files: versionHistory: applied new actions, removed unnecessary api requests 2020-12-23 19:29:05 +03:00
Artem Tarasov
4576f13c9e Web: Files: versionHistory: fix actions 2020-12-23 18:53:09 +03:00
Vladislav Makhov
87ffdf40ad Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
# Conflicts:
#	web/ASC.Web.Components/package.json
2020-12-23 17:56:44 +03:00
Vladislav Makhov
248e032e10 web: files: fix paging combo box 2020-12-23 17:55:58 +03:00
Artem Tarasov
8b4762b9a7 Web: Files: versionHistory: added action updateCommentVersion 2020-12-23 17:46:27 +03:00
Artem Tarasov
b15e6db9cc Web: Files: versionHistory: added action restoreVersion 2020-12-23 16:54:12 +03:00
f3a45738a1 Web: Files: fix merge 2020-12-23 16:13:12 +03:00
Artem Tarasov
6498cd542e Web: Files: versionHistory: added action markAsVersion 2020-12-23 15:40:07 +03:00
Ilya Oleshko
b77a6c987f Web: Files : Fixed displaying version actions if not full access 2020-12-23 14:12:05 +03:00
Ilya Oleshko
b0edb012c8 Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-23 13:38:33 +03:00
Artem Tarasov
274b147a3c Web: Files: VersionHistory: added action fetchFileVersions 2020-12-23 13:38:10 +03:00
Ilya Oleshko
6162918d5c Web: Files : Fixed context actions for visitors. Added open action to folder 2020-12-23 13:36:29 +03:00