Commit Graph

1127 Commits

Author SHA1 Message Date
Artem Tarasov
d036b52fa1 Web: Common: Layout: fixed change orientation chrome (ios) 2020-12-16 13:58:05 +03:00
TatianaLopaeva
ef50248de5 Web: Common: GroupSelector: Refactoring. 2020-12-16 10:57:20 +03:00
Artem Tarasov
91bce60705 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-15 16:33:01 +03:00
TatianaLopaeva
fcc2d2f5a8 Web: Common: PageLayout: Refactoring. 2020-12-15 14:10:07 +03:00
TatianaLopaeva
90780cb631 Web: Common: PageLayout: Fixed displaying of article. 2020-12-15 14:09:22 +03:00
TatianaLopaeva
eb0743a3ad Web: Common/People/Files: Added simplified functionality of scrolling up when switching to a new page. 2020-12-15 14:08:14 +03:00
Artem Tarasov
a66d5c59c6 Web: Common: Layout: refactoring 2020-12-15 13:40:29 +03:00
Artem Tarasov
12c7d62796 Web: Common: Layout: fixed inability to sctroll after changing orientation, added swithing from tabletView to desktop 2020-12-15 13:26:56 +03:00
TatianaLopaeva
5eb1230dc1 Web: Common: PageLayout: Fixed after merge 2020-12-14 21:39:01 +03:00
TatianaLopaeva
0dd8f2858a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
2020-12-14 21:30:39 +03:00
Artem Tarasov
a0f5261576 Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-12-14 20:59:14 +03:00
TatianaLopaeva
0c615d470b Web: Took the information about the width of the window from the store 2020-12-14 19:50:54 +03:00
Ilya Oleshko
bdb433ae35 Web: Common : Api: Fixed default filter sort order 2020-12-14 18:41:44 +03:00
Artem Tarasov
ad42652fdc Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/Layout/index.js
2020-12-14 18:20:58 +03:00
Artem Tarasov
b154b4bcc8 Web: Common: Layout: added isTabletView flag to store 2020-12-14 18:16:21 +03:00
Artem Tarasov
8e0104920b Web: Common: Layout: fixed isTablet 2020-12-14 17:20:26 +03:00
TatianaLopaeva
ae5b128285 Web: Common: Layout: Refactoring 2020-12-14 16:40:20 +03:00
TatianaLopaeva
0657447229 Web: Common: PageLayout: Added maximum width when loading an article (tablet/mobile) 2020-12-11 18:44:35 +03:00
Artem Tarasov
8ae9dd0df7 Web: Common: FilterInput: fixed z-index for backdrop when HideFilter is displayed 2020-12-11 17:16:11 +03:00
Alexey Kostenko
3340786838 Web: Common: FilterInput: Fixed bug in the filter when navigating through groups in the People module 2020-12-11 16:00:00 +03:00
Artem Tarasov
1b825e4cfa Web: Common: PageLayout: fixed condition for trigger stopping if current element is undefined 2020-12-11 11:54:07 +03:00
TatianaLopaeva
8f0dba2be2 Web: Common: PageLayout: Fixed after merged 2020-12-11 11:20:52 +03:00
TatianaLopaeva
c9a8027ddf 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/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.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.Components/package.json
2020-12-11 11:12:28 +03:00
Artem Tarasov
82e3e35cd4 Web: Common: PageLayoyt: deleted console.log 2020-12-10 20:48:58 +03:00
Artem Tarasov
72a21a1def Merge branch 'develop' into bugfix/dropdown-fix 2020-12-10 20:46:24 +03:00
Artem Tarasov
7fbe85b318 Web: Common: PageLayout: fixed application crash after calling the context menu with right button and then clicking on the backdrop 2020-12-10 20:23:49 +03:00
Artem Tarasov
e6dfb13d7d Web: Common/Components/Files: applied isAside prop for backdrop, fixed related bugs 2020-12-10 20:09:16 +03:00
Artem Tarasov
48f782b6bc Web: Common/Components: removed unnecessary DOM requests 2020-12-10 20:06:04 +03:00
8c4be9ab6d Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation 2020-12-10 19:15:44 +03:00
2548dba9b7 Web: Files: Fixed opening file on external link 2020-12-10 19:15:36 +03:00
356ace1c57 Merge branch 'develop' into bugfix/upload-with-convertation 2020-12-10 19:14:58 +03:00
b85faae56b Web: Common: fixed filter update 2020-12-10 18:41:42 +03:00
Alexey Kostenko
ea3f287acb Web: Common: Removed unused prop 2020-12-10 14:25:51 +03:00
Alexey Kostenko
abda53a082 Web: Files/People/Common: Fixed header styles 2020-12-10 13:31:53 +03:00
Alexey Kostenko
1a53841499 Web: Files/People/Common: Fixed header style 2020-12-10 09:48:35 +03:00
09ce302b57 Web: Files: Init new conversation process 2020-12-09 18:37:24 +03:00
2e0762b2c3 Merge branch 'develop' into bugfix/upload-with-convertation
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
2020-12-09 16:19:03 +03:00
254b03032f Web: Common: Fixed status of undefined 2020-12-09 13:52:47 +03:00
Artem Tarasov
fb10d00272 Web: Files/Components/Common/People: z-index fix 2020-12-09 10:59:04 +03:00
Artem Tarasov
854acc0b1a Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-12-08 23:03:42 +03:00
e4a43ff558 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 18:26:11 +03:00
Alexey Kostenko
b0903aa99b Web: Common: added CustomFilter constant 2020-12-08 18:25:17 +03:00
c8f7555017 Merge branch 'develop' into bugfix/sharing-settings
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/yarn.lock
2020-12-08 18:06:31 +03:00
42bfa9a3a6 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 15:12:42 +03:00
694daae135 Fixed redirection to default page if already logged-in 2020-12-08 15:12:33 +03:00
Ilya Oleshko
d2719e1cd9 Web: Fixed usage lodash/isEqual on fast-deep-equal 2020-12-08 14:09:46 +03:00
Artem Tarasov
071f6c27c3 Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-12-08 13:15:02 +03:00
Alexey Kostenko
6a9b8ca662 Merge branch 'develop' into bugfix/sharing-settings 2020-12-08 12:23:36 +03:00
Viktor Fomin
d9e95dabab Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 21:03:07 +03:00
TatianaLopaeva
f2a3355ae8 Web: Common: Changed import for selector getLanguage 2020-12-07 19:01:10 +03:00