|
|
f3afd79a3f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
# packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
# packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/components/PageLayout/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/context-menu/styled-context-menu.js
# packages/asc-web-components/drop-down/index.js
# packages/asc-web-components/link-with-dropdown/index.js
# packages/asc-web-components/row/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/themes/dark.js
# products/ASC.Files/Client/public/images/files.menu.svg
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/QuickButtons.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.People/Client/public/images/people.menu.svg
# products/ASC.People/Client/src/components/GroupSelector/index.js
# products/ASC.People/Client/src/components/PeopleSelector/index.js
# products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
# products/ASC.People/Client/src/pages/Home/index.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
|
2022-03-01 13:50:26 +03:00 |
|
|
|
0021ee47f5
|
Web: Components: Calendar: Fixed combobox direction
|
2022-02-25 16:12:01 +03:00 |
|
|
|
b016e3b38f
|
Web: Components: Calendar: Added fixedDirection property
|
2022-02-25 16:07:54 +03:00 |
|
|
|
d255872c2a
|
Web: Components: Combobox: added displaySelectedOption prop
|
2022-02-25 12:18:10 +03:00 |
|
|
|
ba0bfe7260
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
# Conflicts:
# packages/asc-web-components/calendar/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
|
2022-02-24 15:59:56 +03:00 |
|
|
|
2e000f1d9d
|
Web: People: fixed profile dates
|
2022-02-24 15:48:02 +03:00 |
|
|
|
356e00ceed
|
Web: Components: Calendar: fixed disabled months
|
2022-02-18 11:30:47 +03:00 |
|
|
|
cdf18cbcf7
|
Web: Components: corrected the display of calendar months
|
2022-02-17 11:44:13 +03:00 |
|
|
|
78fb372dcd
|
Web: e2e-tests: Fix create user test
|
2022-02-08 18:05:45 +03:00 |
|
|
|
5261d053ee
|
Web:Components:Calendar: add support dark-theme
|
2021-12-13 21:25:03 +08:00 |
|
|
|
be8a28a99b
|
Web: Components: fixed displaying drop down
|
2021-10-12 20:22:31 +05:00 |
|
Artem Tarasov
|
c8d614a3ba
|
Web: Components: refactoring stories, add public/images to components for storybook
|
2021-03-07 14:57:26 +03:00 |
|
Artem Tarasov
|
7fb751c2cd
|
Web: Components: added story of DatePicker, refactoring stiries, fixes bug of input.js in styled-text-input.js
|
2021-03-03 14:57:14 +03:00 |
|
Artem Tarasov
|
96da41faa1
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# package.json
# packages/asc-web-components/package.json
# yarn.lock
|
2021-03-03 12:00:23 +03:00 |
|
Artem Tarasov
|
9ae9d7132e
|
Web: Components: added story of Checkbox, fix passing props
|
2021-03-02 17:20:16 +03:00 |
|
Artem Tarasov
|
4b3e491e95
|
Web: Ccomponents: fixed source section in Stories, modified webpack.config.js
|
2021-03-02 16:27:45 +03:00 |
|
Artem Tarasov
|
843f3df500
|
Web: Components: added story of Calendar
|
2021-03-02 16:01:12 +03:00 |
|
Alexey Kostenko
|
f0eef94f2a
|
Web: Components: Fixed jest config, fixed components, fixed tests, added package for test
|
2021-03-02 11:25:11 +03:00 |
|
Artem Tarasov
|
487fd2affc
|
Web: Components/Common: fix imports
|
2021-02-26 00:19:45 +03:00 |
|
Vladislav Makhov
|
e91bb64d03
|
web: people: fix imports
|
2021-02-25 15:16:52 +03:00 |
|
Artem Tarasov
|
69dd27fac7
|
Web: applied new import from appserver/components
|
2021-02-24 20:11:23 +03:00 |
|
Artem Tarasov
|
5f2d0e4616
|
Web: Components: changed component hierarchy
|
2021-02-24 17:42:09 +03:00 |
|
