projects / arvados-workbench2.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cbd623 353c391)
Merge branch 'master'
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 20 Aug 2018 10:54:29 +0000 (12:54 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 20 Aug 2018 10:54:29 +0000 (12:54 +0200)
Feature #14014

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

1  2 
src/views/workbench/workbench.tsx patch | diff1 | diff2 | blob | history

diff --cc src/views/workbench/workbench.tsx
index 4949b6a0b60e8194c04c0bdce967c5b83ce9af9d,3e0ed55ff3d9f605fa20846af70e6de8a570d336..4d0adf15184ccff1e9d210e9e5dc15bb00832eca
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -243,7 -244,8 +245,9 @@@ export const Workbench = withStyles(sty
                          <CreateProjectDialog />
                          <CreateCollectionDialog />
                          <RenameFileDialog />
 +                        <CollectionPartialCopyDialog />
+                         <MoveToProjectDialog />
+                         <DialogCollectionCreateWithSelectedFile />
                          <FileRemoveDialog />
                          <MultipleFilesRemoveDialog />
                          <UpdateCollectionDialog />