refs #master Merge branch 'origin/master' into 14280-query-language
authorDaniel Kos <daniel.kos@contractors.roche.com>
Mon, 26 Nov 2018 20:14:06 +0000 (21:14 +0100)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Mon, 26 Nov 2018 20:14:06 +0000 (21:14 +0100)
commit89c3c647797787377f4d950b38d320ee3b28e92c
tree916c2097c80a30f18791e620c7c5206d0dee02ed
parent72b6c853b95b1ef3da2a0beca3a31e4838a17896
parentfec23dba0d04028d842cc0e2f832ec84828f5bae
refs #master Merge branch 'origin/master' into 14280-query-language

# Conflicts:
# src/store/collections/collection-create-actions.ts
# src/store/processes/process-move-actions.ts
# src/store/processes/process-update-actions.ts

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
14 files changed:
src/models/resource.ts
src/store/auth/auth-action.ts
src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
src/store/collections/collection-copy-actions.ts
src/store/collections/collection-create-actions.ts
src/store/collections/collection-move-actions.ts
src/store/collections/collection-partial-copy-actions.ts
src/store/processes/process-move-actions.ts
src/store/processes/process-update-actions.ts
src/store/projects/project-move-actions.ts
src/store/repositories/repositories-actions.ts
src/store/search-bar/search-bar-actions.test.ts
src/store/search-bar/search-bar-actions.ts
src/store/search-results-panel/search-results-middleware-service.ts