projects / arvados-workbench2.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: c384037 5b38ed2)
refs #13887 Merge branch 'origin/13887-extract-common-functionality-from-project...
authorDaniel Kos <daniel.kos@contractors.roche.com>
Thu, 2 Aug 2018 07:29:15 +0000 (09:29 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Thu, 2 Aug 2018 09:18:35 +0000 (11:18 +0200)
commit6cb43ce8d9ab8345a1b2a5abd961c7c134f5c607
tree6fe70f065a4565cfd602304ebcf9be634aa09a05tree | snapshot
parentc384037883732764d73829804aabee0ccfc8aa61commit | diff
parent5b38ed263a3efd88a215c0911dc969303001645ccommit | diff
refs #13887 Merge branch 'origin/13887-extract-common-functionality-from-project-and-favorites-panels'

# Conflicts:
# src/store/navigation/navigation-action.ts
# src/store/store.ts
# src/views-components/create-project-dialog/create-project-dialog.tsx
# src/views/project-panel/project-panel.tsx
# src/views/workbench/workbench.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
src/components/column-selector/column-selector.test.tsx diff1 | diff2 | blob | history
src/store/data-explorer/data-explorer-middleware.test.ts | diff2 | blob | history
src/store/navigation/navigation-action.ts diff1 | diff2 | blob | history
src/store/store.ts diff1 | diff2 | blob | history
src/views-components/context-menu/action-sets/collection-action-set.ts diff1 | | blob | history
src/views-components/context-menu/action-sets/favorite-action-set.ts diff1 | diff2 | blob | history
src/views-components/context-menu/action-sets/project-action-set.ts diff1 | diff2 | blob | history
src/views-components/create-project-dialog/create-project-dialog.tsx diff1 | diff2 | blob | history
src/views/project-panel/project-panel.tsx diff1 | diff2 | blob | history
src/views/workbench/workbench.tsx diff1 | diff2 | blob | history