refs #master Merge branch 'origin/master' into 14007-ts-paths
authorDaniel Kos <daniel.kos@contractors.roche.com>
Mon, 13 Aug 2018 17:48:41 +0000 (19:48 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Mon, 13 Aug 2018 17:48:41 +0000 (19:48 +0200)
commit876e5e2f31a218255845977489ea70aacc0211cd
treea9445e9cb4cdccf5918800f319196fe8d7aa6d6b
parentdd89200ad6fdbfa337fdbab5f54def8712c6746c
parentdf041a7ff7f8515adc49b2e2ddd3fc6663b345af
refs #master Merge branch 'origin/master' into 14007-ts-paths

# Conflicts:
# src/components/data-explorer/data-explorer.test.tsx
# src/components/data-explorer/data-explorer.tsx
# src/store/navigation/navigation-action.ts
# src/views-components/context-menu/action-sets/root-project-action-set.ts
# src/views-components/details-panel/empty-details.tsx
# src/views/favorite-panel/favorite-panel.tsx
# src/views/project-panel/project-panel.tsx
# src/views/workbench/workbench.test.tsx
# src/views/workbench/workbench.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
12 files changed:
src/components/data-explorer/data-explorer.tsx
src/components/details-attribute/details-attribute.tsx
src/components/side-panel/side-panel.tsx
src/store/navigation/navigation-action.ts
src/store/project/project-action.ts
src/store/side-panel/side-panel-reducer.ts
src/views-components/context-menu/action-sets/root-project-action-set.ts
src/views-components/details-panel/empty-details.tsx
src/views/favorite-panel/favorite-panel.tsx
src/views/project-panel/project-panel.tsx
src/views/workbench/workbench.test.tsx
src/views/workbench/workbench.tsx