Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2fcfec1bd3b8b31e39c2ae67816c723d96ebf177 https://github.com/galaxyproject/galaxy/commit/2fcfec1bd3b8b31e39c2ae67816c7... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-24 (Tue, 24 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/rules/rule-definitions.js Log Message: ----------- Data Libary -> Rule Builder fixes. - Missed allowing collection name in library mode - I told Martin this possible because I thought it was and the library collection type text states it is possible but I didn't fix the switch in rule-definitions.js and notice the problems in createCollection associated with that. - Fix to drop file type and genome selector when coming from libraries because this targets existing datasets - think this might have slipped back in a bad merge. - Fix modal title when coming from data library folders. - Improve text instructions when coming from a library. Fixes #5967. Commit: 1d5d83feac999797a127aee7d3b64a0811d1ed49 https://github.com/galaxyproject/galaxy/commit/1d5d83feac999797a127aee7d3b64... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-04-24 (Tue, 24 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/rules/rule-definitions.js Log Message: ----------- Merge pull request #5969 from jmchilton/rule_fixes_1 Data Library -> Rule Builder fixes. Compare: https://github.com/galaxyproject/galaxy/compare/f3455f5276d1...1d5d83feac99