projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
56a2e5c
8e91383
)
Merge branch 'main' from workbench2.git
author
Tom Clegg <tom@curii.com>
Mon, 6 Nov 2023 17:14:51 +0000
(12:14 -0500)
committer
Tom Clegg <tom@curii.com>
Mon, 6 Nov 2023 17:14:51 +0000
(12:14 -0500)
refs #18874
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
14 files changed:
1
2
services/workbench2/cypress/integration/page-not-found.spec.js
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/components/collection-panel-files/collection-panel-files.tsx
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/index.tsx
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/services/collection-service/collection-service.ts
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/store/process-logs-panel/process-logs-panel-actions.ts
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/store/process-panel/process-panel-actions.ts
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/store/project-panel/project-panel-middleware-service.ts
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/store/trash/trash-actions.ts
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/store/workbench/workbench-actions.ts
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/views/collection-panel/collection-panel.tsx
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/views/not-found-panel/not-found-panel.tsx
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/views/process-panel/process-panel-root.tsx
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/views/project-panel/project-panel.tsx
patch
|
diff1
|
diff2
|
blob
|
history
services/workbench2/src/views/workflow-panel/registered-workflow-panel.tsx
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/workbench2/cypress/integration/page-not-found.spec.js
Simple merge
diff --cc
services/workbench2/src/components/collection-panel-files/collection-panel-files.tsx
Simple merge
diff --cc
services/workbench2/src/index.tsx
Simple merge
diff --cc
services/workbench2/src/services/collection-service/collection-service.ts
Simple merge
diff --cc
services/workbench2/src/store/process-logs-panel/process-logs-panel-actions.ts
Simple merge
diff --cc
services/workbench2/src/store/process-panel/process-panel-actions.ts
Simple merge
diff --cc
services/workbench2/src/store/project-panel/project-panel-middleware-service.ts
Simple merge
diff --cc
services/workbench2/src/store/trash/trash-actions.ts
Simple merge
diff --cc
services/workbench2/src/store/workbench/workbench-actions.ts
Simple merge
diff --cc
services/workbench2/src/views/collection-panel/collection-panel.tsx
Simple merge
diff --cc
services/workbench2/src/views/not-found-panel/not-found-panel.tsx
Simple merge
diff --cc
services/workbench2/src/views/process-panel/process-panel-root.tsx
Simple merge
diff --cc
services/workbench2/src/views/project-panel/project-panel.tsx
Simple merge
diff --cc
services/workbench2/src/views/workflow-panel/registered-workflow-panel.tsx
Simple merge