|
|
1083fd8416
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-30 16:09:53 +03:00 |
|
Artem Tarasov
|
4da80d3f0c
|
Web: Files: deleted unnecessary code
|
2021-06-30 10:50:06 +03:00 |
|
Artem Tarasov
|
d73bb73dab
|
Web: Components: rewrited component SwitchButton to ViewSelector
|
2021-06-29 15:27:46 +03:00 |
|
|
|
b7ce849e32
|
Web: Components: Theme: Fixed line height for ComboBox component
|
2021-06-18 09:57:02 +03:00 |
|
Artem Tarasov
|
ee4760e899
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
|
2021-06-11 18:30:44 +03:00 |
|
|
|
7e19a25b0c
|
Web: fixed text styles
|
2021-05-24 14:30:11 +03:00 |
|
Artem Tarasov
|
5d2264d483
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/FileItem.js
# products/ASC.Files/Client/src/components/FilesContainer.js
# products/ASC.Files/Client/src/components/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/sub-components/Badges.js
# products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/sub-components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
|
2021-04-27 13:40:38 +03:00 |
|
Alexey Kostenko
|
e187db767f
|
Web: Login: Updated field with buttons for login
|
2021-04-09 16:00:41 +03:00 |
|
Alexey Kostenko
|
6fadc94b71
|
Web: Components/People: Fixed social-button styles
|
2021-03-25 18:06:48 +03:00 |
|
Artem Tarasov
|
1d90de34ec
|
Web: Commponents: added SwitchButton component (from AppComponents)
|
2021-03-24 16:14:59 +03:00 |
|
Alexey Kostenko
|
e1df253b22
|
Web: People/Components: Added login settings buttons to edit profile page, social button - style fix
|
2021-03-23 18:29:29 +03:00 |
|
Artem Tarasov
|
dabf704485
|
Web: Client/Components: Wizard: layout fix
|
2021-03-18 22:55:15 +03:00 |
|
TatianaLopaeva
|
131de36293
|
Web: Components: combobox: Fixed styles of icon.
|
2021-03-18 13:45:22 +03:00 |
|
Alexey Kostenko
|
25b136eada
|
Web: Components: Files: Fixed row styles
|
2021-03-16 11:26:49 +03:00 |
|
Artem Tarasov
|
460b34a1a8
|
Web: Components: added themes for storybook
|
2021-03-14 21:10:16 +03:00 |
|
TatianaLopaeva
|
ccc45a8d74
|
Web: Components: checkbox: Fix displaying indeterminate color.
|
2021-03-02 20:15:27 +03:00 |
|
Artem Tarasov
|
5f2d0e4616
|
Web: Components: changed component hierarchy
|
2021-02-24 17:42:09 +03:00 |
|
