Commit Graph

6362 Commits

Author SHA1 Message Date
TatianaLopaeva
02df0294cf Web: Common: Removed inactive scrollbars in tablet view, horizontal scroll added to the end of the visible page height. 2021-01-13 15:21:06 +03:00
TatianaLopaeva
9bcb922c1a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	web/ASC.Web.Common/src/components/Layout/index.js
#	web/ASC.Web.Common/src/components/NavMenu/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2021-01-13 13:27:55 +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
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
fc55550521
Merge pull request #166 from ONLYOFFICE/feature/asc-files-tests
Feature/asc files tests
2020-12-30 18:03:11 +03:00
Vladislav Makhov
44ba6f350f Merge branch 'develop' into feature/desktop-view 2020-12-30 16:20:47 +03:00
TatianaLopaeva
f3cfcdde7e Web: Common: Fixed displaying of article. 2020-12-30 14:08:48 +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
Artem Tarasov
f419dadb6f Web: Common: Layout: fix resize event listener for safari versions less then 14 2020-12-30 11:35:24 +03:00
TatianaLopaeva
e6bc57c4b1 Web: Common: Removed jumps of header. 2020-12-30 10:08:31 +03:00
74aa0abca8 Bump version to v0.0.6 2020-12-29 19:43:37 +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
TatianaLopaeva
f4b2922663 Web: Common: Fixed displaying of article header loading. 2020-12-29 16:36:08 +03:00
TatianaLopaeva
d988d44b11 Web: Common: Fixed displaying of aside header. 2020-12-29 16:15:24 +03:00
Vladislav Makhov
e6cf51575a Merge branch 'develop' into feature/desktop-view 2020-12-29 16:08:08 +03:00
TatianaLopaeva
8e64d66239 WEb: Common: Fixed displaying of article header. 2020-12-29 14:38:10 +03:00
TatianaLopaeva
300fcfde5d Web: Common: Fixed resize of article. 2020-12-29 14:34:56 +03:00
39a0cb99de Update yarn.lock files 2020-12-29 14:03:05 +03:00
e70e845c5f web: common: bump version 2020-12-29 13:52:50 +03:00
675599c57d web: components: bump version 2020-12-29 13:52:38 +03:00
Vladislav Makhov
7dfdae8a72 Merge branch 'develop' into feature/desktop-view 2020-12-29 09:33:55 +03:00
TatianaLopaeva
da06f84d49 Web: Common: Fixed z-index when drop down is open. 2020-12-28 19:35:55 +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
e6943a4544 Merge branch 'develop' into feature/11.0.2 2020-12-28 16:28:26 +03:00
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
TatianaLopaeva
6f8df750ba Web: Common: Refactoring. 2020-12-28 16:21:59 +03:00
TatianaLopaeva
a9d7228dcb Web: Common: Fixed padding-right of section. 2020-12-28 15:42:51 +03:00
TatianaLopaeva
78b7315a6e Web: Common/Components: Fixed the problem of updating data when switching from desktop to tablet view. 2020-12-28 15:34:05 +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
Vladislav Makhov
17fd85b5c7 Update props validation 2020-12-28 10:39:30 +03:00
Vladislav Makhov
4c5131211c Fix styles 2020-12-28 10:37:53 +03:00
472cb4bb0b Fix warning Resolution field "js-yaml@3.13.1" is incompatible with requested version "js-yaml@~3.7.0" 2020-12-25 18:10:54 +03:00
2be04b3bc0 Update package.json and yarn.lock files 2020-12-25 17:48:11 +03:00
04e387f8d0 web: common: bump version 2020-12-25 17:03:03 +03:00
d31d0c7d03 Web: Common: fixed PeopleSelector employee status PropType 2020-12-25 17:01:42 +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
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
TatianaLopaeva
e79eb283a3 Web: Common/People: Deleted useless scroll up. 2020-12-24 18:06:20 +03:00
TatianaLopaeva
9c7936327a Web: Common: Layout: Refactoring. 2020-12-24 18:03:51 +03:00
TatianaLopaeva
4e7b414c03 Web: Common/People: Fixed display downloading of profile & edit profile. 2020-12-24 18:02:49 +03:00