605e7eba35
Fix bad merge febf172875
2021-12-28 14:56:00 +03: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
50db047ca8
Web: Components: MainButton: Reworked MainButton component
2021-11-19 17:59:58 +03:00
6e4e3d69aa
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
2021-10-12 20:26:45 +05:00
96980d00b8
Web: Components: changed article panel width
2021-10-04 15:08:56 +03:00
1fe11360a8
Web: Components: added portals to drop-down
2021-09-13 14:56:02 +05:00
0cfb70d9e2
Error 52089 - Client.Files. Elements of the page are not selected using left mouse button.
2021-08-23 13:50:21 +03:00
9fcbb5c873
Web: Storybook issues fix:
...
+ Added copy public/images to static/images for publish
+ Fix checkbox click in theme-provider.stories.js
+ Added empty_screen_filter.png for EmptyScreenContainer
2021-03-24 13:55:50 +03:00
TatianaLopaeva
eee9213cad
Web: Components: Fixed styles of action menu of people.
2021-03-19 14:05:51 +03:00
TatianaLopaeva
2d3b587286
Web: Components: main-button: Refactoring & Deleted useless import.
2021-03-12 13:52:14 +03:00
7de4fcc755
Web: Files: fixed main-button opening
2021-03-12 12:33:48 +03:00
Artem Tarasov
f2045ab5f0
Web: Components: added stories (ModalDialog, MainButton, Loader, Link, LinkWithDropDown, Label, IconButton),fix HelpButton, Heading stories
2021-03-08 23:18:45 +03:00
Vladislav Makhov
23e77d4822
web: components: fix import
2021-03-01 12:29:59 +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
