|
2a045fc1ef
|
Web: Files: removed contextMenuData, moved getContextModel to withFileActions HOC
|
2022-03-10 10:09:10 +03:00 |
|
|
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 |
|
|
11708952e9
|
Web: People: fixed context-menu
|
2022-03-05 10:48:27 +03:00 |
|
|
291052112d
|
Web: People: fixed TableRow
|
2022-03-05 10:22:53 +03:00 |
|
Timofey Boyko
|
a2e9518d3d
|
Web:Common: add 1.2.1 view styles and scroll for context menu
|
2022-03-04 20:55:28 +03:00 |
|
|
2cc05247db
|
Web: Files: removed withContextOptions HOC, added ContextOptionsStore, moved getting context model to open function
|
2022-03-02 15:15:03 +03: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 |
|
|
deeff80f26
|
Web: TabLe: refactoring table view
|
2022-02-22 16:00:26 +03:00 |
|
|
88a2934409
|
Web: Components: fix display table after merge
|
2022-02-22 11:34:13 +03:00 |
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
Timofey
|
223c04a3c7
|
Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2
|
2022-02-03 20:59:26 +08:00 |
|
Timofey
|
bc9dd07400
|
Merge branch 'develop' into branch feature/new-context-menu
|
2022-02-01 15:07:01 +08:00 |
|
Timofey
|
47974e378f
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-21 19:31:48 +08:00 |
|
|
0dbf805f8b
|
Web:Components:TableContainer: add support dark-theme
|
2021-12-15 17:26:45 +08:00 |
|
|
2de54722d6
|
Web: Files: added TitleShowActions and TitleShowFolderActions translations, added row and tile context menu titles
|
2021-12-01 17:17:12 +05:00 |
|
|
638f6b6ddb
|
Fixed Bug 53878 - Client: Check box. Fixed checkbox clickability
|
2021-11-19 13:44:41 +03:00 |
|
|
0fd5c2b67f
|
Web: Files: renamed isDisabled to inProgress
|
2021-11-17 16:33:25 +03:00 |
|
|
a4d913a2c3
|
Web: Components: added Loader to TableRow
|
2021-11-16 12:43:29 +03:00 |
|
|
853037c00d
|
Merge branch 'develop' into feature/new-context-menu
|
2021-11-01 18:43:35 +08:00 |
|
|
5deac850b2
|
Web:Components:NewContextMenu: add to all views
|
2021-11-01 16:10:07 +08:00 |
|
|
e8f535d710
|
Web: People: fixed table styles
|
2021-10-18 13:11:26 +03:00 |
|
|
36b13211fa
|
Web: Components: fixed table styles, fixed table, refactoring
|
2021-10-18 12:22:33 +03:00 |
|
|
afa804ed35
|
Merge branch 'release/1.0.0' into bugfix/Bug-52897
# Conflicts:
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
|
2021-10-07 19:20:15 +03:00 |
|
|
3eea8beea0
|
Web: Files: fixed row selection
|
2021-10-05 12:14:21 +03:00 |
|
Artem Tarasov
|
a75745aaaf
|
Web: Components/Files: fixed selection styles for table
|
2021-09-30 16:27:01 +03:00 |
|
|
d712c7446a
|
Web: Components: fix
|
2021-09-16 14:12:21 +03:00 |
|
|
ef40908652
|
Web: Components: rewrite fill on class
|
2021-09-16 13:42:57 +03:00 |
|
|
d0973d8a86
|
Web: Components: add fill select row
|
2021-09-16 12:56:04 +03:00 |
|
|
a4d12a2c75
|
Web: Files: removed console.log
|
2021-08-27 14:06:24 +03:00 |
|
|
f740b63fa5
|
Web: Components: fixed hasAccess
|
2021-08-26 17:50:27 +03:00 |
|
|
6bb9cb2235
|
Web: People: fixed user access for module People
|
2021-08-26 17:47:21 +03:00 |
|
|
833cd9553c
|
Web: Files: fixed FilesTableRow after merge
|
2021-08-26 16:20:02 +03:00 |
|
|
ff7f3926ce
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# public/locales/de/Common.json
# public/locales/it/Common.json
# public/locales/lo/Common.json
# public/locales/pt-BR/Common.json
# public/locales/ro/Common.json
|
2021-08-26 16:05:15 +03:00 |
|
|
e5c15cb7a7
|
Web: Files: Table: fixed drag styles
|
2021-08-25 16:53:26 +03:00 |
|
|
fce37422f4
|
Web: Components: fixed styled, fixed isViewedSelected error
|
2021-08-16 12:15:36 +03:00 |
|
|
8fca0ae6d1
|
Web: Components: Table: fixed styles, refactoring
|
2021-08-02 13:17:34 +03:00 |
|
|
6829a2c854
|
Web: People: added table view, refactoring
|
2021-07-29 20:21:26 +03:00 |
|
|
24a550cf57
|
Web: People: created new HOCs for people, refactoring
|
2021-07-28 21:06:14 +03:00 |
|
|
d86605e2da
|
Web: Files: added drag and drop for table
|
2021-07-23 18:13:06 +03:00 |
|
|
b957b48c4e
|
Web: Components: Table: fixed header styles
|
2021-07-16 15:32:46 +03:00 |
|
|
4cb025b5b2
|
Web: Files: added selectbox support
|
2021-07-16 12:36:47 +03:00 |
|
|
cd8242ee69
|
Web: Files: added context-menu to files module
|
2021-07-15 18:10:37 +03:00 |
|
|
568aa61071
|
Web: Table: refactoring
|
2021-07-15 10:57:06 +03:00 |
|
|
08a380d5aa
|
Web: Table: changed the logic of work
|
2021-07-13 11:07:50 +03:00 |
|