Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: d448001fe6ef5bcd6c5ba763a7e5a0718c2909d4
https://github.com/galaxyproject/galaxy/commit/d448001fe6ef5bcd6c5ba763a7e5…
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2017-12-31 (Sun, 31 Dec 2017)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-node.js
Log Message:
-----------
Also update tool_id when switching versions in workflow editor
Commit: cb4ef22e1b83a91eeec7d6e54942af333871d67d
https://github.com/galaxyproject/galaxy/commit/cb4ef22e1b83a91eeec7d6e54942…
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2017-12-31 (Sun, 31 Dec 2017)
Changed paths:
A static/maps/legacy/grid/grid-model.js.map
A static/maps/legacy/grid/grid-template.js.map
A static/maps/legacy/grid/grid-view.js.map
A static/maps/libs/bibtexParse.js.map
A static/maps/libs/jquery/jquery.complexify.js.map
A static/maps/libs/vue.js.map
A static/maps/mvc/history/history-item-li.js.map
A static/maps/mvc/history/job-states-model.js.map
A static/maps/mvc/lazy/lazy-limited.js.map
A static/maps/mvc/library/library-util.js.map
A static/maps/mvc/upload/upload-extension.js.map
M static/maps/mvc/workflow/workflow-node.js.map
A static/maps/reports/run_stats.js.map
A static/maps/toolshed/groups/group-detail-view.js.map
A static/maps/toolshed/groups/group-list-view.js.map
A static/maps/toolshed/groups/group-listrow-view.js.map
A static/maps/toolshed/groups/group-model.js.map
A static/maps/toolshed/toolshed.groups.js.map
A static/scripts/bundled/admin.js.map
A static/scripts/bundled/adminToolshed.js.map
A static/scripts/bundled/analysis.js.map
A static/scripts/bundled/extended.js.map
A static/scripts/bundled/library.js.map
A static/scripts/bundled/libs.js.map
A static/scripts/bundled/login.js.map
A static/scripts/bundled/masthead.js.map
A static/scripts/bundled/viz.js.map
A static/scripts/bundled/workflow.js.map
A static/scripts/libs/bibtexParse.js
A static/scripts/libs/jquery/jquery.complexify.js
A static/scripts/libs/vue.js
M static/scripts/mvc/workflow/workflow-node.js
Log Message:
-----------
Build client
Commit: 41ce472cf2a2453d54b1e5b597d72ede50ab65be
https://github.com/galaxyproject/galaxy/commit/41ce472cf2a2453d54b1e5b597d7…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2018-01-01 (Mon, 01 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-node.js
A static/maps/legacy/grid/grid-model.js.map
A static/maps/legacy/grid/grid-template.js.map
A static/maps/legacy/grid/grid-view.js.map
A static/maps/libs/bibtexParse.js.map
A static/maps/libs/jquery/jquery.complexify.js.map
A static/maps/libs/vue.js.map
A static/maps/mvc/history/history-item-li.js.map
A static/maps/mvc/history/job-states-model.js.map
A static/maps/mvc/lazy/lazy-limited.js.map
A static/maps/mvc/library/library-util.js.map
A static/maps/mvc/upload/upload-extension.js.map
M static/maps/mvc/workflow/workflow-node.js.map
A static/maps/reports/run_stats.js.map
A static/maps/toolshed/groups/group-detail-view.js.map
A static/maps/toolshed/groups/group-list-view.js.map
A static/maps/toolshed/groups/group-listrow-view.js.map
A static/maps/toolshed/groups/group-model.js.map
A static/maps/toolshed/toolshed.groups.js.map
A static/scripts/bundled/admin.js.map
A static/scripts/bundled/adminToolshed.js.map
A static/scripts/bundled/analysis.js.map
A static/scripts/bundled/extended.js.map
A static/scripts/bundled/library.js.map
A static/scripts/bundled/libs.js.map
A static/scripts/bundled/login.js.map
A static/scripts/bundled/masthead.js.map
A static/scripts/bundled/viz.js.map
A static/scripts/bundled/workflow.js.map
A static/scripts/libs/bibtexParse.js
A static/scripts/libs/jquery/jquery.complexify.js
A static/scripts/libs/vue.js
M static/scripts/mvc/workflow/workflow-node.js
Log Message:
-----------
Merge pull request #5249 from mvdbeek/fix_wrong_tool_id_after_switching_versions
[17.09] Fix wrong tool id after switching versions
Commit: 7483648b3e7ddfd5cc4d9ebfbf80a62ed741462c
https://github.com/galaxyproject/galaxy/commit/7483648b3e7ddfd5cc4d9ebfbf80…
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2018-01-02 (Tue, 02 Jan 2018)
Changed paths:
M lib/galaxy/datatypes/binary.py
Log Message:
-----------
Catch error when displaying broken BAM file
This should fix https://github.com/galaxyproject/galaxy/issues/5252.
Commit: bdbc1a680e46c3853f47489b6e3649b596ce5c95
https://github.com/galaxyproject/galaxy/commit/bdbc1a680e46c3853f47489b6e36…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-01-04 (Thu, 04 Jan 2018)
Changed paths:
M lib/galaxy/datatypes/binary.py
Log Message:
-----------
Merge pull request #5253 from mvdbeek/catch_pysam_errors_when_viewing_bam_files
[17.09] Catch and display error when displaying broken BAM file
Commit: 8602ecbfacd5e3f953bcd400180ee292bbf51f8b
https://github.com/galaxyproject/galaxy/commit/8602ecbfacd5e3f953bcd400180e…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2018-01-05 (Fri, 05 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Only collect required attributes of linked steps
Commit: 087537a7ade904735d864f9451eb956257890158
https://github.com/galaxyproject/galaxy/commit/087537a7ade904735d864f9451eb…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-01-05 (Fri, 05 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Merge pull request #5271 from guerler/fix_workflow_leak
[17.09] Only collect required attributes of linked steps
Commit: 6cecafa6f3b56f4f9987f8b9d78df0d41b843d37
https://github.com/galaxyproject/galaxy/commit/6cecafa6f3b56f4f9987f8b9d78d…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M lib/galaxy/datatypes/binary.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/release_17.09' into dev
Commit: ac11236a0a837f6c0db9bf2ca95ba7cf96b09e21
https://github.com/galaxyproject/galaxy/commit/ac11236a0a837f6c0db9bf2ca95b…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form.js
Log Message:
-----------
Client format.
Commit: 11f5dabeb9f167ede53519bf554613a3c4cf8a98
https://github.com/galaxyproject/galaxy/commit/11f5dabeb9f167ede53519bf5546…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/extended.bundled.js
M static/scripts/mvc/tool/tool-form-composite.js
M static/scripts/mvc/workflow/workflow-node.js
Log Message:
-----------
Make client.
Commit: 1cabbb1e9988f4b65e23402ef2136e922dd3f410
https://github.com/galaxyproject/galaxy/commit/1cabbb1e9988f4b65e23402ef213…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M client/galaxy/scripts/mvc/tool/tool-form.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M lib/galaxy/datatypes/binary.py
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/extended.bundled.js
M static/scripts/mvc/tool/tool-form-composite.js
M static/scripts/mvc/workflow/workflow-node.js
Log Message:
-----------
Merge 17.09 -> dev.
Commit: d1ac0d9a56b915f1885b44333d4a6b6d8840de7a
https://github.com/galaxyproject/galaxy/commit/d1ac0d9a56b915f1885b44333d4a…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M client/galaxy/scripts/mvc/tool/tool-form.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M lib/galaxy/datatypes/binary.py
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/extended.bundled.js
M static/scripts/mvc/tool/tool-form-composite.js
M static/scripts/mvc/workflow/workflow-node.js
Log Message:
-----------
Merge pull request #5274 from dannon/dev
Merge 17.09 -> dev.
Compare: https://github.com/galaxyproject/galaxy/compare/60e0b3af62f2...d1ac0d9a56b9
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 264b8680f3af1eb39c641a0b8a7392ee3b80a967
https://github.com/galaxyproject/galaxy/commit/264b8680f3af1eb39c641a0b8a73…
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/sort_collection_list.xml
A test-data/new_element_sort_order.txt
Log Message:
-----------
Allow sorting collection elements based on file
Given a collection with element_identifiers:
```yml
element_1
element_2
```
we can arbitrarily re-order collection elements using a dataset
that specifies the new order, e.g
```
element_2
element_1
```
I think this nicely complements numeric and alphanumeric sorts that are
already possible with this tool.
Commit: 60e0b3af62f284c4df18b84633034120964dcfc6
https://github.com/galaxyproject/galaxy/commit/60e0b3af62f284c4df18b8463303…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/sort_collection_list.xml
A test-data/new_element_sort_order.txt
Log Message:
-----------
Merge pull request #5273 from mvdbeek/sort_collection_from_file
Allow sorting collection elements based on file
Compare: https://github.com/galaxyproject/galaxy/compare/1266b691d881...60e0b3af62f2
Branch: refs/heads/release_17.09
Home: https://github.com/galaxyproject/galaxy
Commit: 8602ecbfacd5e3f953bcd400180ee292bbf51f8b
https://github.com/galaxyproject/galaxy/commit/8602ecbfacd5e3f953bcd400180e…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2018-01-05 (Fri, 05 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Only collect required attributes of linked steps
Commit: 087537a7ade904735d864f9451eb956257890158
https://github.com/galaxyproject/galaxy/commit/087537a7ade904735d864f9451eb…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-01-05 (Fri, 05 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Merge pull request #5271 from guerler/fix_workflow_leak
[17.09] Only collect required attributes of linked steps
Compare: https://github.com/galaxyproject/galaxy/compare/bdbc1a680e46...087537a7ade9