Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ab92eb6691903e35b75c16bee8f77e0b40db8085 https://github.com/galaxyproject/galaxy/commit/ab92eb6691903e35b75c16bee8f77... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-23 (Mon, 23 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/library/library-foldertoolbar-view.js Log Message: ----------- Allow using the rule based collection builders right from libraries. Commit: 7fd12ec7b83ee303aedb9d77b31d479000b7b5f3 https://github.com/galaxyproject/galaxy/commit/7fd12ec7b83ee303aedb9d77b31d4... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-23 (Mon, 23 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/package.json M client/webpack.config.js Log Message: ----------- Rev handsontable client dep - fixes global style contamination of that component. Commit: d4a890f2fc46c4dd82a77e3a5772546d88a6b95d https://github.com/galaxyproject/galaxy/commit/d4a890f2fc46c4dd82a77e3a57725... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-23 (Mon, 23 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- Fix links in rule builder to not interfere with the library router. Commit: 1209f35a1a6b5647a58b5c5f5c93d73388db8d64 https://github.com/galaxyproject/galaxy/commit/1209f35a1a6b5647a58b5c5f5c93d... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-23 (Mon, 23 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- Pleasant error handling if duplicate identifiers encountered. - Print a pretty error for this scenerio. - Improve the error state of the widget to add a cancel and "okay" button - the cancel button dimisses the widget and the okay button gives the reseracher a chance to return to the rules and try again. Commit: f042f51b366e4c6c82643f30b0fd7bc5fde7950a https://github.com/galaxyproject/galaxy/commit/f042f51b366e4c6c82643f30b0fd7... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-23 (Mon, 23 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- Style improvements for error messages in RuleBuilder. Commit: 393f436ce5946440df2e0b6de04ebc6558a57b3f https://github.com/galaxyproject/galaxy/commit/393f436ce5946440df2e0b6de04eb... 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/library/library-foldertoolbar-view.js M client/package.json M client/webpack.config.js Log Message: ----------- Merge pull request #5929 from jmchilton/library_2_rules Allow using the rule based collection builders right from libraries. Compare: https://github.com/galaxyproject/galaxy/compare/581e949dff5a...393f436ce594