|
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 |
|
Timofey
|
21cd73a698
|
Web: restore code format
|
2022-01-28 21:44:58 +08:00 |
|
|
efffe7feb3
|
Fixed Bug 54482 - People. User profile is not removed from the context menu
|
2022-01-10 10:55:29 +03:00 |
|
|
4c5ba66857
|
Web: People: fixed table cell styles
|
2021-12-28 16:47:57 +03:00 |
|
|
76595827fa
|
Web:People:HOCs: add support dark-theme
|
2021-12-28 15:20:56 +08:00 |
|
|
3a50fca3cc
|
Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display
|
2021-12-02 18:32:36 +05:00 |
|
|
7ca1a18a37
|
Web: People: added translations for column position
|
2021-11-15 18:35:08 +03:00 |
|
|
5ebf7509da
|
Web: People: fixed drop down displaying in ContactField components
|
2021-10-12 20:25:32 +05:00 |
|
|
6bb9cb2235
|
Web: People: fixed user access for module People
|
2021-08-26 17:47:21 +03:00 |
|
|
6829a2c854
|
Web: People: added table view, refactoring
|
2021-07-29 20:21:26 +03:00 |
|
|
e6efbb45b1
|
Web: People: added new translations, moved translations to Common.json
|
2021-07-29 16:09:56 +03:00 |
|
|
24a550cf57
|
Web: People: created new HOCs for people, refactoring
|
2021-07-28 21:06:14 +03:00 |
|
|
a31dc583c1
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
|
2021-07-02 16:26:45 +03:00 |
|
|
4f9e03212f
|
Web: Files: added filter cleaning
|
2021-07-02 13:44:58 +03:00 |
|
|
2cdcd36020
|
Web: Commented annoying logs
|
2021-06-22 13:43:18 +03:00 |
|
Artem Tarasov
|
74fba5c2de
|
Web: People: fixed loading Profile, ProfileAction, fixed navigation between them
|
2021-06-11 13:25:09 +03:00 |
|
Artem Tarasov
|
67feed3cf9
|
Web: People: fix crash Profile
|
2021-06-08 14:01:19 +03:00 |
|
Artem Tarasov
|
5dc279b5a9
|
Web: People: added withLoader to Profile
|
2021-06-08 12:28:19 +03:00 |
|
Artem Tarasov
|
81b6ea3d02
|
Web: People: refactoring withLoader, applied for Home
|
2021-06-08 02:49:34 +03:00 |
|
Artem Tarasov
|
a317b02e2e
|
Web: People: added and applied LoadingStore
|
2021-06-08 01:22:28 +03:00 |
|
Artem Tarasov
|
6d7361ecd0
|
Web: People: added HOC withLoader
|
2021-06-07 01:09:13 +03:00 |
|