Artem Tarasov
|
e7a7aed6ec
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/Files.jsx
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/index.js
|
2021-05-28 15:30:39 +03:00 |
|
|
|
eb628d3703
|
Merge branch 'develop' into bugfix/enable-favorites-recent-settings
|
2021-05-14 11:34:10 +03:00 |
|
|
|
1a58007fcd
|
Web: Common: removed custom selection frame
|
2021-05-14 11:21:59 +03:00 |
|
|
|
0d98b05210
|
Web: Files: fixed icons clickability
|
2021-05-13 16:57:10 +03:00 |
|
|
|
f05147eb29
|
Web: Common: fixed clickability for mobile devices
|
2021-05-12 16:53:40 +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 |
|
|
|
1658e0d60a
|
Web: Common: removed custom SelectedFrame, fixed frame styles
|
2021-04-21 11:48:50 +03:00 |
|
Artem Tarasov
|
7f4888d2a2
|
Web: Files: fix drag
|
2021-04-21 02:23:31 +03:00 |
|
Vladislav Makhov
|
c60d653bc1
|
web: fix hiding unpinned article when menu item clicked
|
2021-04-16 13:41:36 +03:00 |
|
|
|
c7017920e8
|
Web: fixed selection for mobile devices
|
2021-04-13 12:56:03 +03:00 |
|
|
|
5daf690ffb
|
Web: fixed selection
|
2021-04-13 12:49:37 +03:00 |
|
|
|
5936640ce2
|
Web: fixed selection
|
2021-04-13 12:43:17 +03:00 |
|
|
|
8cfd5eb644
|
Web: Added SelectedFrame
|
2021-04-13 09:35:07 +03:00 |
|
TatianaLopaeva
|
cdef097fdd
|
Web: Fixed hiding header when switching group.
|
2021-04-07 13:35:32 +03:00 |
|
TatianaLopaeva
|
6b7bc650da
|
Web: components: Added margin-bottom for fixed height of article.
|
2021-04-06 17:23:32 +03:00 |
|
Viktor Fomin
|
4fe20bdca9
|
Web: Common: fixed article width
|
2021-03-20 16:20:51 +03:00 |
|
|
|
28a798c542
|
Web: Fixed work with translations + refactoring:
+ Login re-written to functional component
+ Replaced css to scss
|
2021-03-04 19:09:46 +03:00 |
|
|
|
efaeaff894
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 14:46:45 +03:00 |
|
|
|
684c0e777f
|
Web: Refactoring
|
2021-03-03 14:46:37 +03:00 |
|
Vladislav Makhov
|
c2a5eea4be
|
web: people: refactoring
|
2021-03-03 12:05:08 +03:00 |
|
Artem Tarasov
|
48b3c6b445
|
Web: Common: fix after merge, fix imports and hierarchy
|
2021-02-25 17:20:11 +03:00 |
|
