Branch: refs/heads/release_18.05
Home: https://github.com/galaxyproject/galaxy
Commit: 352ba5f634ff5469039afa4cb6ec5b6fecabe6c6
https://github.com/galaxyproject/galaxy/commit/352ba5f634ff5469039afa4cb6ec…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M client/galaxy/scripts/mvc/upload/upload-button.js
Log Message:
-----------
show tooltip only on hover for upload button
Commit: 5265e93be9fc2cf8c65400d8c1853169377868a9
https://github.com/galaxyproject/galaxy/commit/5265e93be9fc2cf8c65400d8c185…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M client/galaxy/scripts/mvc/history/history-view-edit.js
M client/galaxy/scripts/mvc/history/history-view.js
Log Message:
-----------
move some tooltips to the top
so they don't interfere with other actions when shown
Commit: bf0543743ff832375e1b7128bdaa4fc5b0714038
https://github.com/galaxyproject/galaxy/commit/bf0543743ff832375e1b7128bdaa…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M client/galaxy/scripts/mvc/history/history-view-edit.js
M client/galaxy/scripts/mvc/history/history-view.js
M client/galaxy/scripts/mvc/upload/upload-button.js
Log Message:
-----------
Merge remote-tracking branch 'martenson/tooltip-ux' into release_18.05
Commit: 3a45c1617a0f2b24c6cea344a30aab51c36947ce
https://github.com/galaxyproject/galaxy/commit/3a45c1617a0f2b24c6cea344a30a…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M client/galaxy/scripts/components/RuleCollectionBuilder.vue
M client/galaxy/scripts/mvc/history/history-view-edit.js
M client/galaxy/scripts/mvc/history/history-view.js
M client/galaxy/scripts/mvc/ui/ui-modal.js
M client/yarn.lock
Log Message:
-----------
Client build/format on merge to 18.05
Compare: https://github.com/galaxyproject/galaxy/compare/bd63c04c2e19...3a45c1617a0f
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 50f9ca82ba158736e7ed735e3d949a65127a5111
https://github.com/galaxyproject/galaxy/commit/50f9ca82ba158736e7ed735e3d94…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2018-04-19 (Thu, 19 Apr 2018)
Changed paths:
M lib/galaxy/containers/__init__.py
M lib/galaxy/visualization/plugins/interactive_environments.py
M lib/galaxy/web/proxy/__init__.py
M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py
Log Message:
-----------
Don't attempt to determine ports at GIE container launch time if they
fail to be determined on the first attempt. They'll be determined by the
readiness check instead.
Commit: a7a4e12e79a91a2a17fa86d65077233f8cfcb35c
https://github.com/galaxyproject/galaxy/commit/a7a4e12e79a91a2a17fa86d65077…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2018-04-26 (Thu, 26 Apr 2018)
Changed paths:
M lib/galaxy/model/__init__.py
Log Message:
-----------
Fix collection element count getting lost during collection copies.
Commit: 3c7bffb8352fb419d9ca2ff2c5d1bbdf26d8a7b6
https://github.com/galaxyproject/galaxy/commit/3c7bffb8352fb419d9ca2ff2c5d1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2018-04-26 (Thu, 26 Apr 2018)
Changed paths:
M client/galaxy/scripts/components/RuleCollectionBuilder.vue
Log Message:
-----------
Fix ftp imports in rule builder.
Commit: 8470815163336d54078b713452ae9dcd58dfe53f
https://github.com/galaxyproject/galaxy/commit/8470815163336d54078b713452ae…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2018-04-26 (Thu, 26 Apr 2018)
Changed paths:
M client/galaxy/scripts/mvc/rules/rule-definitions.js
Log Message:
-----------
Fix add row number rule.
Commit: a29770ca554b5aaf8ea6533ee413fed77042a0ea
https://github.com/galaxyproject/galaxy/commit/a29770ca554b5aaf8ea6533ee413…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M scripts/common_startup.sh
Log Message:
-----------
Pin the version of node we use in CI, etc....
Our dependencies won't resolve under node 10 currently (because of upath at least https://github.com/anodynos/upath/blob/master/package.json#L43 but maybe other packages as well).
Commit: c7b426089aa7ec0e0ba874e03ed9dad60a9d1909
https://github.com/galaxyproject/galaxy/commit/c7b426089aa7ec0e0ba874e03ed9…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M scripts/common_startup.sh
Log Message:
-----------
Merge pull request #6000 from jmchilton/fix_build_maybe
[18.01] Backport #5972
Commit: e3331817283bdffa4a6fbf65627f44a1faf61239
https://github.com/galaxyproject/galaxy/commit/e3331817283bdffa4a6fbf65627f…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M client/galaxy/scripts/components/RuleCollectionBuilder.vue
M client/galaxy/scripts/mvc/rules/rule-definitions.js
Log Message:
-----------
Merge pull request #5991 from jmchilton/rule_fixes_2
[18.05] Small Rule Builder Fixes
Commit: 9da13d2d3d3a444e9cd45880496c883b30b475b0
https://github.com/galaxyproject/galaxy/commit/9da13d2d3d3a444e9cd45880496c…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M lib/galaxy/model/__init__.py
Log Message:
-----------
Merge pull request #5990 from jmchilton/collection_count_fix
[18.01] Fix collection element count getting lost during collection copies.
Commit: 26ab5388ba31de646d365fbc8528a86b7dc7949a
https://github.com/galaxyproject/galaxy/commit/26ab5388ba31de646d365fbc8528…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M lib/galaxy/containers/__init__.py
M lib/galaxy/visualization/plugins/interactive_environments.py
M lib/galaxy/web/proxy/__init__.py
M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py
Log Message:
-----------
Merge pull request #5930 from natefoo/gie-late-ports
[18.01] Only try to determine GIE container ports once at launch, then hand off to readiness check
Commit: bd63c04c2e1988e838a033830f60e1ad6c2d9bf7
https://github.com/galaxyproject/galaxy/commit/bd63c04c2e1988e838a033830f60…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M lib/galaxy/containers/__init__.py
M lib/galaxy/model/__init__.py
M lib/galaxy/visualization/plugins/interactive_environments.py
M lib/galaxy/web/proxy/__init__.py
M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py
Log Message:
-----------
Merge remote-tracking branch 'origin/release_18.01' into release_18.05
Commit: 6a8c4dc7e287c83c335879e02caa61493d2aa967
https://github.com/galaxyproject/galaxy/commit/6a8c4dc7e287c83c335879e02caa…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2018-04-27 (Fri, 27 Apr 2018)
Changed paths:
M client/galaxy/scripts/components/RuleCollectionBuilder.vue
M client/galaxy/scripts/mvc/rules/rule-definitions.js
M lib/galaxy/containers/__init__.py
M lib/galaxy/model/__init__.py
M lib/galaxy/visualization/plugins/interactive_environments.py
M lib/galaxy/web/proxy/__init__.py
M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py
Log Message:
-----------
Merge remote-tracking branch 'origin/release_18.05' into dev
Compare: https://github.com/galaxyproject/galaxy/compare/39dd9ac76c4d...6a8c4dc7e287