projects / arvados.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: b863f7a 22cfdad)
refs #13535 Merge branch '13535-tree-component' into 13610-projects-hierarchy
authorDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 12 Jun 2018 19:38:39 +0000 (21:38 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 12 Jun 2018 19:38:39 +0000 (21:38 +0200)
commiteeb82d50816250cc6287928e6d958affa73880ee
tree609fd5bc781d2ec36769f07d6acf5af680f46a3etree | snapshot
parentb863f7aaab7112a32c7f9b1e7a0299c4266df2f5commit | diff
parent22cfdad7a451f67b0b4c195b58815cdf2abcfda9commit | diff
refs #13535 Merge branch '13535-tree-component' into 13610-projects-hierarchy

# Conflicts:
# package.json
# src/components/tree/tree.tsx
# src/index.tsx
# src/models/project.ts
# src/store/project-action.ts
# src/store/project-reducer.ts
# src/views/workbench/workbench.test.tsx
# src/views/workbench/workbench.tsx
# tslint.json
# yarn.lock

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
package.json diff1 | diff2 | blob | history
src/index.tsx diff1 | diff2 | blob | history
src/models/project.ts diff1 | diff2 | blob | history
src/store/project/project-action.ts diff1 | | blob | history
src/store/project/project-reducer.ts diff1 | | blob | history
src/views/workbench/workbench.test.tsx diff1 | diff2 | blob | history
src/views/workbench/workbench.tsx diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history