Commit Graph

6517 Commits

Author SHA1 Message Date
TatianaLopaeva
af96aaf2b3 Web: Changed imports. 2021-02-01 16:10:02 +03:00
TatianaLopaeva
ddab131a90 Web: Deleted useless import. 2021-01-29 17:41:35 +03:00
TatianaLopaeva
cf65b86b22 Web: Added Payments Routing. 2021-01-29 17:39:26 +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
8a9bd141a5 Web: Added Error404 routing 2021-01-29 13:22:41 +03:00
b0e8b9c6af Bump version to v0.0.10 2021-01-29 11:13:27 +03:00
TatianaLopaeva
7730e43f5a web: common: bump version 2021-01-28 16:27:35 +03:00
TatianaLopaeva
55b408a323 web: components: bump version 2021-01-28 16:27:11 +03:00
TatianaLopaeva
754a790d3f Web: Common: Deleted useless import. 2021-01-28 16:23:56 +03:00
TatianaLopaeva
6782af330e Web: Common: Deleted commented code. 2021-01-28 16:22:03 +03:00
TatianaLopaeva
a22e262310 Update yarn lock files 2021-01-28 16:18:22 +03:00
TatianaLopaeva
7ca066cea9 Web: Components: Added react device detect package 2021-01-28 16:17:36 +03:00
0b79d24b38 web: common: bump version 2021-01-28 15:08:55 +03:00
6dd906248a web: components: bump version 2021-01-28 15:08:01 +03:00
ca5e60837b Merge branch 'feature/fix-hide/show-header' of https://github.com/ONLYOFFICE/AppServer into feature/fix-hide/show-header 2021-01-28 15:07:48 +03:00
d2da68badf Web: Common: fixed backdrop closing 2021-01-28 15:07:38 +03:00
TatianaLopaeva
3d0ad401e3 Web: Common: Fixed the problem with backdrop. 2021-01-28 14:45:57 +03:00
a5727795fc web: components: bump version 2021-01-27 19:29:19 +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
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
Viktor Fomin
32bfef070e Update yarn.lock files 2021-01-27 17:23:40 +03:00
Viktor Fomin
93753dc753 web: common: bump version 2021-01-27 17:19:15 +03:00
Viktor Fomin
b0763ae1de web: components: bump version 2021-01-27 17:19:07 +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
TatianaLopaeva
0cf5c0e39f Web:Common: ScrollToTop component refactoring. 2021-01-27 11:09:28 +03:00
436bf7a06e Web: People: Added routes 2021-01-27 10:31:29 +03:00
Artem Tarasov
8829da29b0 Web: Common: Layout: fixed recalculation of height in Safari for large tablets 2021-01-26 20:20:21 +03:00
TatianaLopaeva
943015a8d6 Web: Fixed after merge. 2021-01-26 18:59:19 +03:00
TatianaLopaeva
951961ad35 Web: Refactoring. 2021-01-26 18:21:50 +03:00
Artem Tarasov
7bd819a1ae Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header 2021-01-26 16:29:06 +03:00
3efedf74eb Web: Fixed routing on Module link 2021-01-26 16:28:51 +03:00
Artem Tarasov
8082be3eb4 Web: Common: Layout: fixed page height for large tablets 2021-01-26 16:28:45 +03:00
TatianaLopaeva
99162c3c2a Web: Common: PageLayout: Deleted useless condition. 2021-01-26 16:25:53 +03:00
TatianaLopaeva
3ccf73adb7 Web: Common: PageLayout: Fixed margin top for Ipad. 2021-01-26 15:41:03 +03:00
TatianaLopaeva
40d94e48e5 Web: Common: PageLayout: Changed the height of section header for Ipad. 2021-01-26 15:06:02 +03:00
TatianaLopaeva
d8a17e6443 Web: Common: PageLayout: Added the condition for margin top for Ipad. 2021-01-26 14:39:44 +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
Artem Tarasov
4165af21ea web: components: bump version 2021-01-25 19:41:07 +03:00
Artem Tarasov
d2e930a4a1 Web: Components: Backdrop: fixed the ability to scroll the page when the backdrop is active 2021-01-25 19:40:52 +03:00
Artem Tarasov
3c815511ac Web: Common: Layout: fixed the ability to scroll the page when the dropdown is open 2021-01-25 16:34:56 +03:00
Artem Tarasov
0622f3003f Web: Client: App: fixed tag name 2021-01-25 10:36:50 +03:00
TatianaLopaeva
545dacc8ca Web: Common: Fixed scrolling of article on small tablet and mobile, fixed margin top of unpin article. 2021-01-22 16:50:20 +03:00
711fc4954e web: components: bump version 2021-01-22 15:53:54 +03:00
167c20b06a Web: Components: fixed drop-down event function 2021-01-22 15:53:31 +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
Vladislav Makhov
93af940e51 web: commented console.log 2021-01-21 20:55:36 +03:00
4f1398e33e web: common: bump version 2021-01-21 18:44:13 +03:00