This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[1mdiff --git a/client/src/components/History/Content/ContentItem.test.js b/client/src/components/History/Content/ContentItem.test.js[m | |
[1mindex 8526789a84..01d4dffbae 100644[m | |
[1m--- a/client/src/components/History/Content/ContentItem.test.js[m | |
[1m+++ b/client/src/components/History/Content/ContentItem.test.js[m | |
[36m@@ -46,12 +46,12 @@[m [mdescribe("ContentItem", () => {[m | |
DatasetDetails: true,[m | |
vueTagsInput: false,[m | |
},[m | |
[31m- provide: {[m | |
[31m- store: {[m |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/galaxy/files/sources/galaxy.py b/lib/galaxy/files/sources/galaxy.py | |
index ebbf9d303e..e1a02a30ab 100644 | |
--- a/lib/galaxy/files/sources/galaxy.py | |
+++ b/lib/galaxy/files/sources/galaxy.py | |
@@ -12,6 +12,26 @@ from .posix import ( | |
PosixFilesSourceProperties, | |
) | |
+class UserHomeFilesSource(PosixFilesSource): | |
+ plugin_type = "gxuserhome" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/galaxy/files/sources/galaxy.py b/lib/galaxy/files/sources/galaxy.py | |
index ebbf9d303e..62efed21f0 100644 | |
--- a/lib/galaxy/files/sources/galaxy.py | |
+++ b/lib/galaxy/files/sources/galaxy.py | |
@@ -12,6 +12,26 @@ from .posix import ( | |
PosixFilesSourceProperties, | |
) | |
+class UserHomeFilesSource(PosixFilesSource): | |
+ plugin_type = "gxuserhome" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue | |
index e38445528e..45427cee35 100644 | |
--- a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue | |
+++ b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue | |
@@ -237,12 +237,15 @@ export default { | |
async getSelected() { | |
if (this.isAllSelectedMode) { | |
this.$emit("setBusy", true); | |
+ console.debug("Get selected!") | |
+ console.debug('first', this.selected); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/client/src/components/Workflow/Editor/WorkflowGraph.vue b/client/src/components/Workflow/Editor/WorkflowGraph.vue | |
index 3dc2aa26b1..d3c0dfab5f 100644 | |
--- a/client/src/components/Workflow/Editor/WorkflowGraph.vue | |
+++ b/client/src/components/Workflow/Editor/WorkflowGraph.vue | |
@@ -68,7 +68,7 @@ const canvas: Ref<HTMLElement | null> = ref(null); | |
const elementBounding = useElementBounding(canvas, { windowResize: false, windowScroll: false }); | |
const scroll = useScroll(canvas); | |
-const { transform, panBy, setZoom, moveTo } = useD3Zoom(1, minZoom, maxZoom, canvas, scroll); | |
+const { transform, panBy, setZoom, moveTo } = useD3Zoom(1, minZoom, maxZoom, canvas, scroll, { x: 10, y: 10 }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[1mdiff --git a/client/src/mvc/visualization/chart/chart-client.js b/client/src/mvc/visualization/chart/chart-client.js[m | |
[1mindex 4a030f5c10..4891596ef2 100644[m | |
[1m--- a/client/src/mvc/visualization/chart/chart-client.js[m | |
[1m+++ b/client/src/mvc/visualization/chart/chart-client.js[m | |
[36m@@ -46,6 +46,7 @@[m [mexport default Backbone.View.extend({[m | |
})[m | |
.done((dataset) => {[m | |
this.dataset = dataset;[m | |
[32m+[m[32m console.debug("LOADING CHART WITH THIS", this);[m | |
this.chart.load();[m |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[1mdiff --git a/lib/galaxy/webapps/galaxy/controllers/workflow.py b/lib/galaxy/webapps/galaxy/controllers/workflow.py[m | |
[1mindex 63a8d66698..3e51a7d830 100644[m | |
[1m--- a/lib/galaxy/webapps/galaxy/controllers/workflow.py[m | |
[1m+++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py[m | |
[36m@@ -538,16 +538,13 @@[m [mclass WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi[m | |
][m | |
[m | |
# identify item tags[m | |
[31m- item_tags = [tag for tag in stored.tags if tag.user == trans.user][m | |
[31m- item_tag_names = [][m |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[1mdiff --git a/client/src/components/History/Content/ContentItem.vue b/client/src/components/History/Content/ContentItem.vue[m | |
[1mindex cea253c0df..ef11920be1 100644[m | |
[1m--- a/client/src/components/History/Content/ContentItem.vue[m | |
[1m+++ b/client/src/components/History/Content/ContentItem.vue[m | |
[36m@@ -219,7 +219,7 @@[m [mexport default {[m | |
this.$router.push(this.itemUrls.edit);[m | |
},[m | |
onShowCollectionInfo() {[m | |
[31m- backboneRoute(this.itemUrls.showDetails);[m | |
[32m+[m[32m this.$router.push(this.itemUrls.showDetails);[m |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/client/src/components/History/CurrentCollection/CollectionPanel.vue b/client/src/components/History/CurrentCollection/CollectionPanel.vue | |
index 271d759e73..77ea4c07fa 100644 | |
--- a/client/src/components/History/CurrentCollection/CollectionPanel.vue | |
+++ b/client/src/components/History/CurrentCollection/CollectionPanel.vue | |
@@ -12,7 +12,6 @@ | |
<section class="dataset-collection-panel d-flex flex-column"> | |
<section> | |
<CollectionNavigation | |
- ref="collectionNav" | |
:history="history" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/galaxy/model/migrations/alembic/versions_gxy/f6fb225c05ab_add_notification_table.py b/lib/galaxy/model/migrations/alembic/versions_gxy/f6fb225c05ab_add_notification_table.py | |
index 6a45bd9211..a141d8217d 100644 | |
--- a/lib/galaxy/model/migrations/alembic/versions_gxy/f6fb225c05ab_add_notification_table.py | |
+++ b/lib/galaxy/model/migrations/alembic/versions_gxy/f6fb225c05ab_add_notification_table.py | |
@@ -37,5 +37,6 @@ def upgrade(): | |
def downgrade(): | |
+ op.drop_constraint('user_notification_association_notification_id_fkey', 'user_notification_association') | |
op.drop_table("notification_push") |
NewerOlder