Commit Graph

3744 Commits

Author SHA1 Message Date
TatianaLopaeva
5d26bd5670 Web: Downgrade rc-tree package. 2021-02-20 13:19:01 +03:00
TatianaLopaeva
7023cf5f3a Web: Transferring icons from a shared folder to modules. Icons are displayed by url. 2021-02-20 11:46:32 +03:00
TatianaLopaeva
af96aaf2b3 Web: Changed imports. 2021-02-01 16:10:02 +03:00
652c7bd906 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/Layout/MobileLayout.js
#	packages/asc-web-common/src/components/Layout/ScrollToTop.js
#	packages/asc-web-common/src/components/Layout/context.js
#	packages/asc-web-common/src/components/Layout/index.js
#	packages/asc-web-common/src/components/NavMenu/index.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
#	packages/asc-web-common/src/components/PageLayout/index.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/article.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section.js
#	packages/asc-web-components/src/components/icons/svg/button.cancel.react.svg
#	packages/asc-web-components/src/components/icons/svg/clear.active.react.svg
#	packages/asc-web-components/src/components/icons/svg/load.error.react.svg
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/App.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-01-29 16:39:00 +03:00
b0e8b9c6af Bump version to v0.0.10 2021-01-29 11:13:27 +03:00
a9b16585ea Files: fix delete 2021-01-29 10:17:56 +03:00
TatianaLopaeva
8adfa96cbb Web: Files: Deleted useless console.log. 2021-01-28 16:20:03 +03:00
TatianaLopaeva
a22e262310 Update yarn lock files 2021-01-28 16:18:22 +03:00
TatianaLopaeva
993611097b Merge branch 'develop' into feature/fix-hide/show-header 2021-01-28 10:50:29 +03:00
TatianaLopaeva
24ee58f0f6 Web: Files/People: Fixed height of context menu for desktop. 2021-01-28 10:45:44 +03:00
0246a30e84 Files: fix creation text file 2021-01-27 21:11:47 +03:00
TatianaLopaeva
77ce035d15 Web: Files/People: Fixed context menu for desktop. 2021-01-27 20:01:52 +03:00
666a390f13 Merge branch 'feature/fix-hide/show-header' of https://github.com/ONLYOFFICE/AppServer into feature/fix-hide/show-header 2021-01-27 19:28:45 +03:00
680622218e Web: Components: fixed double opening of context menu for desktops 2021-01-27 19:28:34 +03:00
7cf1252b1e Web: Files: fixed field isFolder to selection 2021-01-27 19:26:14 +03:00
Artem Tarasov
93e6777b27 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Components/package.json
2021-01-27 18:03:12 +03:00
Vladislav Makhov
72a5b5c2b9 Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel 2021-01-27 17:29:09 +03:00
Vladislav Makhov
439abb6cd1 web: files: remove unused code 2021-01-27 17:28:54 +03:00
Viktor Fomin
32bfef070e Update yarn.lock files 2021-01-27 17:23:40 +03:00
Vladislav Makhov
3af17d659f web: files: remove unused code 2021-01-27 16:58:46 +03:00
Vladislav Makhov
a50f1a0d87 web: files: refactoring 2021-01-27 16:58:00 +03:00
Vladislav Makhov
b01200d5ed web: files: remove unused code 2021-01-27 16:30:04 +03:00
Viktor Fomin
6e6d706b23 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/upload-panel 2021-01-27 16:09:59 +03:00
b1dbaf7005 Web: Modified first templates 2021-01-27 15:38:35 +03:00
Vladislav Makhov
700bca9c61 Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel 2021-01-27 13:44:03 +03:00
Vladislav Makhov
7c267fd921 web: files: fix progress bar view 2021-01-27 13:43:51 +03:00
Viktor Fomin
4cc187fc78 Web: Files: fix 2021-01-27 13:10:22 +03:00
Viktor Fomin
88ceb29faa Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel 2021-01-27 12:50:50 +03:00
Viktor Fomin
6e48956d08 Web: Files: fixed empty panel 2021-01-27 12:50:36 +03:00
Viktor Fomin
a8d6ec462a Web: Files: fixed tooltip 2021-01-27 12:37:54 +03:00
Viktor Fomin
3363a34113 Web: Files: filename truncation 2021-01-27 12:18:16 +03:00
Vladislav Makhov
f0052add3e web: files: fix privacy room error 2021-01-27 12:17:37 +03:00
Viktor Fomin
9bb716a575 Web: Files: returned translation 2021-01-27 12:07:24 +03:00
436bf7a06e Web: People: Added routes 2021-01-27 10:31:29 +03:00
30ab7edfcf Web: Fixed import errors 2021-01-27 10:29:15 +03:00
TatianaLopaeva
951961ad35 Web: Refactoring. 2021-01-26 18:21:50 +03:00
Vladislav Makhov
cb11417fb7 web: files: fix share button render 2021-01-26 17:46:36 +03:00
TatianaLopaeva
2b8dfc80e9 Web: Common/Files/People: Fixed "jumps" when go to the next page. 2021-01-26 13:50:29 +03:00
36c7a171df Web: Fixed load/unload People store 2021-01-26 13:36:05 +03:00
b9ed789746 Web: Applied WP:ModuleFederation best practices 2021-01-26 00:55:46 +03:00
Vladislav Makhov
f02c38080e web: files: fix sharing panel render performance 2021-01-25 19:32:45 +03:00
Vladislav Makhov
4400873aa6 web: files: remove console log 2021-01-25 17:46:37 +03:00
TatianaLopaeva
55060e5a23 Web: Files: Fixed after merge. 2021-01-25 14:57:20 +03:00
TatianaLopaeva
bb8c1962fb Merge branch 'develop' into feature/fix-hide/show-header 2021-01-25 14:54:59 +03:00
1602fff50c Files: fix insert 2021-01-25 12:04:25 +03:00
Viktor Fomin
fc4e018c7d Web: Files: fixed uploadData 2021-01-22 14:41:45 +03:00
Viktor Fomin
4a00f39d8d Web: Files: fix 2021-01-22 14:12:40 +03:00
TatianaLopaeva
4a961ad82c Web: Files/People: Added style condition for a mobile device. 2021-01-22 12:50:25 +03:00
789b547ccf Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-01-22 11:24:16 +03:00
Viktor Fomin
02974a973b Web: Files: fixed icon name typo 2021-01-22 11:22:43 +03:00