git.arvados.org - arvados-workbench2.git/commit

projects / arvados-workbench2.git / commit

author	Daniel Kos <daniel.kos@contractors.roche.com>
	Tue, 4 Sep 2018 07:41:44 +0000 (09:41 +0200)
committer	Daniel Kos <daniel.kos@contractors.roche.com>
	Tue, 4 Sep 2018 07:49:11 +0000 (09:49 +0200)
commit	c276ce4c8dd3cf27ad6d17eca9af473f353fda55
tree	68d5de582870377511e022446baa8839cad322af	tree \| snapshot
parent	cf9e11013710478809fe44b5cad7d3b77f6d5a1f	commit \| diff
parent	e53e6f1efe7b156934514b51fd5f956262f6f9af	commit \| diff

refs #13828 Merge branch 'origin/13828-trash-view'

# Conflicts:
# src/index.tsx
# src/routes/routes.ts
# src/store/context-menu/context-menu-actions.ts
# src/store/store.ts
# src/store/workbench/workbench-actions.ts
# src/views/workbench/workbench.tsx

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

19 files changed:

src/common/formatters.ts	diff1 \|	diff2 \|	blob \| history
src/components/data-explorer/data-explorer.test.tsx	diff1 \|	diff2 \|	blob \| history
src/components/icon/icon.tsx	diff1 \|	diff2 \|	blob \| history
src/index.tsx	diff1 \|	diff2 \|	blob \| history
src/models/resource.ts	diff1 \|	diff2 \|	blob \| history
src/routes/routes.ts	diff1 \|	diff2 \|	blob \| history
src/services/common-service/common-resource-service.ts	diff1 \|	diff2 \|	blob \| history
src/services/groups-service/groups-service.test.ts	diff1 \|	diff2 \|	blob \| history
src/services/log-service/log-service.ts	diff1 \|	\|	blob \| history
src/store/context-menu/context-menu-actions.ts	diff1 \|	diff2 \|	blob \| history
src/store/navigation/navigation-action.ts	diff1 \|	diff2 \|	blob \| history
src/store/process-logs-panel/process-logs-panel-actions.ts	diff1 \|	\|	blob \| history
src/store/processes/processes-actions.ts	diff1 \|	diff2 \|	blob \| history
src/store/store.ts	diff1 \|	diff2 \|	blob \| history
src/store/workbench/workbench-actions.ts	diff1 \|	diff2 \|	blob \| history
src/views-components/context-menu/context-menu.tsx	diff1 \|	diff2 \|	blob \| history
src/views/workbench/workbench.tsx	diff1 \|	diff2 \|	blob \| history
src/websocket/websocket-service.ts	diff1 \|	\|	blob \| history
src/websocket/websocket.ts	diff1 \|	\|	blob \| history

RSS Atom

src/common/formatters.ts	diff1 \|	diff2 \|	blob \| history
src/components/data-explorer/data-explorer.test.tsx	diff1 \|	diff2 \|	blob \| history
src/components/icon/icon.tsx	diff1 \|	diff2 \|	blob \| history
src/index.tsx	diff1 \|	diff2 \|	blob \| history
src/models/resource.ts	diff1 \|	diff2 \|	blob \| history
src/routes/routes.ts	diff1 \|	diff2 \|	blob \| history
src/services/common-service/common-resource-service.ts	diff1 \|	diff2 \|	blob \| history
src/services/groups-service/groups-service.test.ts	diff1 \|	diff2 \|	blob \| history
src/services/log-service/log-service.ts	diff1 \|	\|	blob \| history
src/store/context-menu/context-menu-actions.ts	diff1 \|	diff2 \|	blob \| history
src/store/navigation/navigation-action.ts	diff1 \|	diff2 \|	blob \| history
src/store/process-logs-panel/process-logs-panel-actions.ts	diff1 \|	\|	blob \| history
src/store/processes/processes-actions.ts	diff1 \|	diff2 \|	blob \| history
src/store/store.ts	diff1 \|	diff2 \|	blob \| history
src/store/workbench/workbench-actions.ts	diff1 \|	diff2 \|	blob \| history
src/views-components/context-menu/context-menu.tsx	diff1 \|	diff2 \|	blob \| history
src/views/workbench/workbench.tsx	diff1 \|	diff2 \|	blob \| history
src/websocket/websocket-service.ts	diff1 \|	\|	blob \| history
src/websocket/websocket.ts	diff1 \|	\|	blob \| history