git.arvados.org - arvados.git/commit

author	Daniel Kos <daniel.kos@contractors.roche.com>
	Thu, 30 Aug 2018 21:44:55 +0000 (23:44 +0200)
committer	Daniel Kos <daniel.kos@contractors.roche.com>
	Thu, 30 Aug 2018 21:44:55 +0000 (23:44 +0200)
commit	25691034b44b9323cae96c8db002826880ccfd7e
tree	066abc2be5c9bb033c9f10b4050b4623429d967b	tree \| snapshot
parent	f63f3a5360ae6381d4b332bf86ef52b4e22107fb	commit \| diff

Post merge fixes

Feature #13828

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

20 files changed:

src/models/container-request.ts	[new file with mode: 0644]	blob
src/models/process.ts		diff \| blob \| history
src/routes/routes.ts		diff \| blob \| history
src/services/ancestors-service/ancestors-service.ts		diff \| blob \| history
src/services/collection-service/collection-service.ts		diff \| blob \| history
src/store/collections/collection-trash-actions.ts	[deleted file]	blob \| history
src/store/context-menu/context-menu-actions.ts		diff \| blob \| history
src/store/project/project-action.ts	[deleted file]	blob \| history
src/store/store.ts		diff \| blob \| history
src/store/trash-panel/trash-panel-action.ts		diff \| blob \| history
src/store/trash-panel/trash-panel-middleware-service.ts		diff \| blob \| history
src/store/trash/trash-actions.ts	[new file with mode: 0644]	blob
src/store/workbench/workbench-actions.ts		diff \| blob \| history
src/views-components/context-menu/action-sets/collection-action-set.ts		diff \| blob \| history
src/views-components/context-menu/action-sets/collection-resource-action-set.ts		diff \| blob \| history
src/views-components/context-menu/action-sets/project-action-set.ts		diff \| blob \| history
src/views/favorite-panel/favorite-panel.tsx		diff \| blob \| history
src/views/project-panel/project-panel.tsx		diff \| blob \| history
src/views/trash-panel/trash-panel.tsx		diff \| blob \| history
src/views/workbench/workbench.tsx		diff \| blob \| history