git.arvados.org - arvados.git/commit

author	Daniel Kos <daniel.kos@contractors.roche.com>
	Tue, 12 Jun 2018 20:56:58 +0000 (22:56 +0200)
committer	Daniel Kos <daniel.kos@contractors.roche.com>
	Tue, 12 Jun 2018 20:56:58 +0000 (22:56 +0200)
commit	b57a24f2a59938be52c78d453dea00d5cd54720d
tree	b1217d1e7ad8d0bc30369837c44ef255f3e2f6a6	tree \| snapshot
parent	eeb82d50816250cc6287928e6d958affa73880ee	commit \| diff

Post merge fixes, connected tree with projects from the server

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

14 files changed:

package.json		diff \| blob \| history
src/components/project-tree/project-tree.test.tsx		diff \| blob \| history
src/components/project-tree/project-tree.tsx		diff \| blob \| history
src/components/tree/tree.tsx		diff \| blob \| history
src/index.tsx		diff \| blob \| history
src/models/project.ts		diff \| blob \| history
src/services/project-service/project-service.ts		diff \| blob \| history
src/store/project-action.ts	[deleted file]	blob \| history
src/store/project-reducer.ts	[deleted file]	blob \| history
src/store/project/project-action.ts		diff \| blob \| history
src/store/project/project-reducer.test.ts		diff \| blob \| history
src/store/project/project-reducer.ts		diff \| blob \| history
src/views/workbench/workbench.tsx		diff \| blob \| history
yarn.lock		diff \| blob \| history