Commit Graph

1255 Commits

Author SHA1 Message Date
TatianaLopaeva
89bb769b92 Web: Common: Fix scrolling position when opening or editing a profile, refactoring Layout 2020-11-11 20:29:57 +03:00
TatianaLopaeva
58ee96df1f Web: Common: Fixed display of header 2020-11-11 12:09:19 +03:00
TatianaLopaeva
b8cb6f2508 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
2020-11-11 10:13:03 +03:00
TatianaLopaeva
77f0bc0493 Web: Common: Added padding for section-header 2020-11-10 19:45:29 +03:00
Artem Tarasov
4031a609b8 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-10 13:34:04 +03:00
TatianaLopaeva
67cf0a4364 Web: Common: Return position fixed for pin-panel 2020-11-10 11:14:36 +03:00
TatianaLopaeva
326d2e50a9 Web: Common: Changed height and deleted position fixed for article 2020-11-10 10:52:06 +03:00
Vladislav Makhov
9cc469a51c Merge branch 'develop' into feature/third-party-settings 2020-11-10 08:39:33 +03:00
TatianaLopaeva
e65c62a282 Web: Common: Added margin-top 2020-11-09 20:57:13 +03:00
TatianaLopaeva
5eca305fdc Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
2020-11-09 20:53:25 +03:00
TatianaLopaeva
c458c2d4fd Web: Common: Changed styles by layout 2020-11-09 20:50:02 +03:00
Vladislav Makhov
0df2b1e956 web: common: bump version 2020-11-09 18:48:08 +03:00
Ilya Oleshko
3411513117 web: common: bump version 2020-11-09 18:31:13 +03:00
Ilya Oleshko
b16448bea3 Web: Common: Article: Fixed after merge 2020-11-09 18:30:57 +03:00
Vladislav Makhov
078bb238fd Add url to store 2020-11-09 16:15:36 +03:00
TatianaLopaeva
78113a8168 Web: Common: Changed styles by layout 2020-11-09 15:42:48 +03:00
Vladislav Makhov
fee439b390 Refactoring 2020-11-09 15:11:46 +03:00
Artem Tarasov
c2dfeb591c web: common: bump version 2020-11-09 12:43:27 +03:00
Artem Tarasov
3c557194df Web: Common: SelectedFrame: fixed selection of el at the start of selection on the border between rows 2020-11-09 12:38:35 +03:00
Artem Tarasov
612661a22b Web: Files/Common: MainButton: fixed line-height 2020-11-06 16:43:14 +03:00
Artem Tarasov
c791fa29aa Web: Files/Common: PageLayout: fixed margin-top in Header 2020-11-06 16:15:03 +03:00
Artem Tarasov
d8a384adba web: common: bump version 2020-11-06 14:23:37 +03:00
Artem Tarasov
173017ddbb Web: Common: AdvancedSelector: fixed layout 2020-11-06 12:48:08 +03:00
Artem Tarasov
678d31cc32 Web: Common: GroupSelector: fixed placeholder 2020-11-05 23:59:44 +03:00
TatianaLopaeva
9289acdb51 Web: Common: Fixed the problem with show header scrolling horizontally 2020-11-05 19:04:24 +03:00
TatianaLopaeva
3cdc31a39b Web: Common: Fixed width of section-body for tablet/mobile 2020-11-05 16:17:59 +03:00
Artem Tarasov
91019b19bd web: common: bump version 2020-11-05 11:50:08 +03:00
TatianaLopaeva
160c5ced25 Web: Common: Added window width in comparison condition for people module 2020-11-05 11:40:42 +03:00
Artem Tarasov
481abf40f8 Web: Common: applied prop size for Avatar Component 2020-11-05 11:39:09 +03:00
TatianaLopaeva
7e034e60de Web: Common: Added display condition for section-header when group button menu is visible 2020-11-05 10:39:53 +03:00
04003a0fa4 Web: Common: update lock file 2020-11-03 17:26:47 +03:00
TatianaLopaeva
c36f79b526 web: Common: Added window width in comparison condition 2020-11-03 16:02:20 +03:00
Vladislav Makhov
1e483de4ba Merge branch 'develop' into feature/third-party-settings
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
#	web/ASC.Web.Client/src/store/settings/actions.js
#	web/ASC.Web.Client/src/store/settings/reducer.js
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-03 15:29:09 +03:00
Artem Tarasov
8507650485 Web: Common: PageLayout: fixed selection items 2020-11-03 12:23:46 +03:00
TatianaLopaeva
e876d2939a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/Main/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
2020-11-02 16:41:52 +03:00
Artem Tarasov
5f6e0e60e8 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Components/package.json
2020-11-02 13:36:03 +03:00
TatianaLopaeva
5c89eabc81 Web: Common/Components: Added Hide Header on Scroll Down & Show on Scroll Up 2020-11-02 11:55:59 +03:00
440395d341 Web: Common: fixed update main height timeout 2020-10-30 17:22:49 +03:00
Ilya Oleshko
bf879ce810 web: common: bump version 2020-10-30 14:25:22 +03:00
Ilya Oleshko
797afe5c72 Web: Common: changed ReactResizeDetector refreshRate 2020-10-30 14:24:24 +03:00
ea21d49ddc Web: Common: fixed main container height 2020-10-30 12:08:34 +03:00
13c690e183 Web: Common: fixed main container height 2020-10-29 18:18:00 +03:00
bc725f29df Web: Common: added re-resizable package, added new acticle 2020-10-29 17:33:05 +03:00
TatianaLopaeva
aca906db56 Web:Common: Refactoring 2020-10-29 13:23:21 +03:00
Alexey Kostenko
694ccfcec1 web: common: bump version 2020-10-29 10:55:13 +03:00
Alexey Kostenko
55830ab25c Web: Common/Files: PeopleSelector: Added counter to footer button 2020-10-29 10:55:06 +03:00
Alexey Kostenko
19f1984e73 Web: Common/Files: GroupSelector: Added counter to footer button 2020-10-29 10:54:10 +03:00
Alexey Kostenko
638eacd052 Web: Common: AdvancesSelector: Added showCounter prop to AdvancesSelector 2020-10-29 10:44:17 +03:00
TatianaLopaeva
d7a8226671 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/Main/index.js
2020-10-28 19:02:51 +03:00
TatianaLopaeva
2c991fcfd7 Web:Common Deleted unnecessary import 2020-10-28 16:36:16 +03:00