Merge branch 'origin/master' into 13666-data-explorer-mapper
authorDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 26 Jun 2018 06:09:29 +0000 (08:09 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 26 Jun 2018 06:09:29 +0000 (08:09 +0200)
commit5fd5db805554d3eddd46cc911a5108fbb74b3cfc
treec05e151367747132d31b1a17ff7a0a5a09c45189
parent6e44781d01db889030cc5f7819aa7f15fe837e19
parent0af46f7944bde95f634080a1d6b15ae9c585890a
Merge branch 'origin/master' into 13666-data-explorer-mapper

Feature #13666

# Conflicts:
# src/components/tree/tree.tsx
# src/store/project/project-reducer.ts
# src/views-components/data-explorer/data-explorer.tsx
# src/views-components/project-explorer/project-explorer-item.ts
# src/views-components/project-tree/project-tree.tsx
# src/views/data-explorer/data-explorer-selectors.ts
# src/views/data-explorer/data-explorer.tsx
# src/views/workbench/workbench.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
src/index.tsx
src/store/navigation/navigation-action.ts
src/store/project/project-reducer.test.ts
src/store/project/project-reducer.ts
src/store/store.ts
src/views-components/project-explorer/project-explorer-item.ts
src/views-components/project-explorer/project-explorer.tsx
src/views/project-panel/project-panel-selectors.ts
src/views/project-panel/project-panel.tsx
src/views/workbench/workbench.tsx