Artem Tarasov
|
fbab4041c9
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Server/DocStore
|
2021-06-02 15:07:40 +03:00 |
|
|
62ac315c8d
|
Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring
|
2021-06-02 13:55:11 +03:00 |
|
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 |
|
|
25ac98e272
|
Merge branch 'develop' into feature/translations
# Conflicts:
# products/ASC.Files/Client/public/locales/en/DeleteDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
|
2021-05-27 11:13:41 +03:00 |
|
|
1b940de5e2
|
Web: Common: removed I18nextProvider from PageLayout
|
2021-05-24 16:24:23 +03:00 |
|
|
389ee969a2
|
Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json"
|
2021-05-21 17:19:00 +03:00 |
|
|
cda77e1234
|
Merge branch 'develop' into bugfix/context-actions
|
2021-05-20 13:24:18 +03:00 |
|
|
fc822e5ad5
|
Web: Fix setModuleInfo usage
|
2021-05-20 11:27:50 +03:00 |
|
|
d55c953805
|
Web: Files: fixed MediaViewer propTypes
|
2021-05-19 13:45:37 +03:00 |
|
|
07934f6cd9
|
Web: Common: fixed firefox header
|
2021-05-18 17:59:34 +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 |
|
|
72ed5e031c
|
Web: Common: hide delete icon from MediaViewer for shared folder
|
2021-05-12 14:05:54 +03:00 |
|
|
9ea5a131e8
|
Web: Files: fixed MediaViewer crash
|
2021-05-12 11:55:34 +03:00 |
|
Artem Tarasov
|
58a41faa4a
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# yarn.lock
|
2021-05-11 10:30:19 +03:00 |
|
|
71e1468835
|
Web: Common: fixed MediaViewer styles
|
2021-05-06 12:52:19 +03:00 |
|
|
605f7d749e
|
Web: Components: FloatingButton: Added rotation on percent === 0
|
2021-05-04 22:14:42 +03:00 |
|
|
d55b39a653
|
Web: Files: Added and fix AutoFocus, tabulation and close on errors in ConnectDialog
|
2021-04-30 14:02:58 +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 |
|
|
3734027f4f
|
Web: Files: fixed newItem styles
|
2021-04-19 14:16:42 +03:00 |
|
|
9b6e4ace8b
|
Web: Files: fixed badge for tree menu
|
2021-04-19 14:08:40 +03:00 |
|
Vladislav Makhov
|
c60d653bc1
|
web: fix hiding unpinned article when menu item clicked
|
2021-04-16 13:41:36 +03:00 |
|
Artem Tarasov
|
54b96e8aa0
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/SelectedFrame.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
|
2021-04-15 15:05:15 +03:00 |
|
Artem Tarasov
|
f8c69fd939
|
Web: Common: Loaders: added loaders for tiles
|
2021-04-15 11:47:02 +03:00 |
|
Artem Tarasov
|
74a5bf33dc
|
Web: Files: fix drag, deleted console.log
|
2021-04-14 12:41:08 +03:00 |
|
Artem Tarasov
|
4be1db4c9a
|
Web: Files: added calling the context menu when right-clicking on a tile
|
2021-04-14 00:09:51 +03:00 |
|
|
c324404767
|
Web: fixed firefox frame
|
2021-04-13 14:07:44 +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 |
|
Artem Tarasov
|
f8b36757ae
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/store/index.js
|
2021-04-09 11:51:39 +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 |
|
Artem Tarasov
|
43b9301e90
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/FilesTileContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
|
2021-04-01 18:19:09 +03:00 |
|
Artem Tarasov
|
6fdf49742d
|
Web: Common: FilterInput: propTypes fix
|
2021-03-29 22:22:43 +03:00 |
|
|
845105e2f8
|
Web: Common: removed LayoutContextConsumer wrapper
|
2021-03-29 10:24:56 +03:00 |
|
|
14dcfb90c1
|
Web: Common: removed frame for mobile devices
|
2021-03-29 10:08:50 +03:00 |
|
Artem Tarasov
|
155b3e224f
|
Web: Common: FilterInput: added SwitchButton to ViewSelector
|
2021-03-25 12:55:27 +03:00 |
|
|
f9f560f351
|
Web: Common: fixed files selection
|
2021-03-25 11:27:03 +03:00 |
|
TatianaLopaeva
|
cc707204d9
|
Web: Removed jumps of article when the page is loading.
|
2021-03-23 10:39:37 +03:00 |
|
|
12af2890dc
|
Web: Files: fixed markAsRead
|
2021-03-22 19:21:36 +03:00 |
|
TatianaLopaeva
|
9baae539d2
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-22 18:11:45 +03:00 |
|
TatianaLopaeva
|
24cc620904
|
Web: Fixed displaying of shared files at aside & Deleted useless code.
|
2021-03-22 18:11:39 +03:00 |
|
|
a8a6121e59
|
Web: Proxy fixes
|
2021-03-22 17:35:33 +03:00 |
|
Alexey Kostenko
|
3524f3b6c6
|
Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage)
|
2021-03-22 15:27:36 +03:00 |
|