|
|
84810de125
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-components/context-menu/index.js
# packages/asc-web-components/row/index.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
|
2022-03-05 17:52:01 +03:00 |
|
|
|
ba29c3aee0
|
Web: Components: moved slider to components
|
2022-03-04 18:53:41 +05:00 |
|
|
|
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 |
|
|
|
ce048a9646
|
Web: Components: fix avatar resize
|
2022-02-15 14:10:28 +03:00 |
|
|
|
01f8f95556
|
Fixed Bug 55058 - Client.Profile. Fixed broken images in "Sample title" when zooming in on a profile picture in the "Edit Photo" window.
|
2022-02-14 15:54:38 +03:00 |
|
Timofey
|
9b307a2c17
|
Web:Components: change color for link in dark-theme
|
2022-02-08 18:18:21 +08:00 |
|
|
|
0ad204743f
|
Merge branch 'develop' into feature/dark-theme
|
2021-12-29 20:25:29 +08:00 |
|
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
|
|
dc3c7b5e30
|
Fix Bug 54679 - Client.Profile. Failed to execute 'toDataURL' on 'HTMLCanvasElement': Tainted canvases may not be exported
|
2021-12-23 16:48:54 +03:00 |
|
|
|
51103c96ba
|
Fix Bug 54525 - Client.Profile: Remove fake context-menu button
|
2021-12-15 11:56:44 +03:00 |
|
|
|
c00d019d6f
|
Web:Components:AvatarEditor: add support dark-theme
|
2021-12-13 21:10:27 +08:00 |
|
|
|
1004ed5dfb
|
Fixed Bug 53415. Fixed save button
|
2021-11-22 11:20:01 +03:00 |
|
|
|
f675415228
|
Merge branch 'master' into release/v1.1.0
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:26:20 +03:00 |
|
|
|
96759f10f1
|
Web: Components: Fixed tests warnings
|
2021-11-20 00:40:25 +03:00 |
|
|
|
2720604f8d
|
Web: Components: fix mobile align
|
2021-11-18 18:53:35 +03:00 |
|
|
|
585347d02d
|
Web: Components: fix label position
|
2021-11-18 18:40:14 +03:00 |
|
|
|
c6d97c7fc5
|
Web: Components: add avatar max size label
|
2021-11-16 18:23:39 +03:00 |
|
|
|
cab7603f5b
|
Fixed Bug 53415: Fixed save avatar click
|
2021-11-10 18:33:21 +03:00 |
|
|
|
7dc2b94186
|
Web: Components: fixed avatar-editor-body link fontWeight
|
2021-10-21 17:53:49 +03:00 |
|
|
|
ae06469ba8
|
Web: Components: add cross-origin
|
2021-10-15 17:36:37 +03:00 |
|
TatianaLopaeva
|
a75b57060d
|
Web: components: Fixed styles of icons.
|
2021-04-05 17:49:22 +03:00 |
|
Viktor Fomin
|
4d22ea8f44
|
Web: Components: fixed icons positions in avatar editor
|
2021-03-21 23:25:24 +03:00 |
|
Artem Tarasov
|
454b1a4077
|
Web: Components: refactoring .storybook/main.js
|
2021-03-14 21:42:23 +03: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
|
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
|
7edec73e54
|
Web: Components: Avatar: delete old story
|
2021-03-02 13:09:31 +03:00 |
|
Artem Tarasov
|
a25cd562cb
|
Web: Components: added story of AvatarEditor, fixed theme props
|
2021-03-02 13:08:26 +03:00 |
|
Vladislav Makhov
|
23e77d4822
|
web: components: fix import
|
2021-03-01 12:29:59 +03:00 |
|
Vladislav Makhov
|
c38fd63c75
|
web: components: fix import
|
2021-03-01 12:00:34 +03:00 |
|
|
|
f357c8b78c
|
Web: fixed icons for files module
|
2021-02-26 16:29:50 +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 |
|
