Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 8b3fe214763341ffa0a1b614a464de5b9b8561b7 https://github.com/galaxyproject/galaxy/commit/8b3fe214763341ffa0a1b614a464d... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue A client/galaxy/scripts/mvc/rules/rule-definitions.js Log Message: ----------- Refactor rules def toward reuse outside RuleCollectionBuilder.vue. Commit: 47795ea707fcb3575aa823ea143691b53e795c8d https://github.com/galaxyproject/galaxy/commit/47795ea707fcb3575aa823ea14369... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/mvc/collection/list-collection-creator.js Log Message: ----------- Cleanup rule UI code, refactor toward use w/existing collections. Commit: 595c7621419d457587c486d2c05b60ccf35fbb5d https://github.com/galaxyproject/galaxy/commit/595c7621419d457587c486d2c05b6... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M client/galaxy/scripts/mvc/upload/collection/rules-input-view.js Log Message: ----------- Add reset and close buttons for upload widget when selecting rules. Commit: 109e97d82ad9d578966ed98a051f0dce6aeb1682 https://github.com/galaxyproject/galaxy/commit/109e97d82ad9d578966ed98a051f0... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- Rules editor - add X to column definitions inside edit mode. Previously these were only available in preview mode. Commit: d12635375aac0008d987ab71aedfc5a24b115663 https://github.com/galaxyproject/galaxy/commit/d12635375aac0008d987ab71aedfc... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- Improve styling, wording of rule editor buttons. - Replace "Okay" with "Apply" on button labels. - Create CSS style for buttons in rule editor part of the component. - More consistency - right-align all the buttons, more consistent spacing. - Make primary action that button blue to make the buttons look a little bland. Commit: 2254dba7342040c86d28b2c97153d253fe175791 https://github.com/galaxyproject/galaxy/commit/2254dba7342040c86d28b2c97153d... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- Bug fix for conditional rule button rendering... Commit: c34b23b428898f0da5657d96fd048969829d0a91 https://github.com/galaxyproject/galaxy/commit/c34b23b428898f0da5657d96fd048... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-06 (Fri, 06 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- Rule builder - more correct, better abstracted logic for display name input. Commit: b3f589cc9349be2e583f2f085c1d2f696d087d80 https://github.com/galaxyproject/galaxy/commit/b3f589cc9349be2e583f2f085c1d2... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-07 (Sat, 07 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/mvc/rules/rule-definitions.js M client/package.json M client/yarn.lock M test-data/rules/uniprot.json M test/selenium_tests/test_uploads.py Log Message: ----------- For rule builder, use Python-like regular expressions in-browser. Leverages the [pyre-to-regexp](https://github.com/jmchilton/pyre-to-regexp) that I recently published for this purpose. Commit: c520bb400c2a75270c87896b155d24fc574ef7d5 https://github.com/galaxyproject/galaxy/commit/c520bb400c2a75270c87896b155d2... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-07 (Sat, 07 Apr 2018) Changed paths: M client/galaxy/scripts/mvc/rules/rule-definitions.js Log Message: ----------- Type fix for JS rule builder code. Commit: eb67d422ef644cb43c3d66d02c86fd1d5ee41e0a https://github.com/galaxyproject/galaxy/commit/eb67d422ef644cb43c3d66d02c86f... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-04-13 (Fri, 13 Apr 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/mvc/collection/list-collection-creator.js A client/galaxy/scripts/mvc/rules/rule-definitions.js M client/galaxy/scripts/mvc/upload/collection/rules-input-view.js M client/package.json M client/yarn.lock M test-data/rules/uniprot.json M test/selenium_tests/test_uploads.py Log Message: ----------- Merge pull request #5823 from jmchilton/rule_tweaks Various Improvements for the Rule Builder Widget Compare: https://github.com/galaxyproject/galaxy/compare/6e16b776df30...eb67d422ef64