Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 616c1b971a01d7a7cf2967e1fea225c4466d13eb https://github.com/galaxyproject/galaxy/commit/616c1b971a01d7a7cf2967e1fea22... Author: guerler <aysam.guerler@gmail.com> Date: 2018-05-12 (Sat, 12 May 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select.js Log Message: ----------- Add a text label length limit for select2's used in the upload dialog Reduce limit to a 100 characters Match encapsulated values in title string Commit: 8be2da03b52e819d5e4e4ac76dea983f4f0c2448 https://github.com/galaxyproject/galaxy/commit/8be2da03b52e819d5e4e4ac76dea9... Author: John Chilton <jmchilton@gmail.com> Date: 2018-05-14 (Mon, 14 May 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- Improve dialog message while waiting for rule builder job. Commit: 788ed8aa43296537c6439d0fea7a5446ffe15da0 https://github.com/galaxyproject/galaxy/commit/788ed8aa43296537c6439d0fea7a5... Author: John Chilton <jmchilton@gmail.com> Date: 2018-05-14 (Mon, 14 May 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 M client/galaxy/scripts/mvc/upload/collection/rules-input-view.js Log Message: ----------- Improve data initialization of rule builder for long term support. A mistake was made in the rush to rule-builder-all-the-stuffs - libraries, hdas, and FTP all initialized a different set of columns from the data (which is probably fine) but with no indication this was happening in the underlying rules (which is definitely not fine). To understand why this was a mistake and see why in the long term this hurts reproducibility, take loading rules for HDAs from the history panel as an example. In the initial implementation it would pre-initialize two columns - one for "hid" and one for "name" - any rules that were generated from there would start with an implicit assumption of two columns. This is a problem because if someone saves some rules and we (Galaxy developers) decide later on that name tag should be in the initial list but HID doesn't make sense and make that change - we basically are breaking all existing rules to support a very logical change in behavior. Likewise, Galaxy produces a hash with last modified date and size for each FTP entry - this is data we have and could stick in the rule builder by default - but if we change that over time existing FTP rules will break. It would be much more sustainable to instead include the initial column generation information in the initial rules generated - so that each of these modalities start in reality with an empty table and the initial set of rules describe what metadata to pull initial columns from. This way if you save a set of rules it will include the initial column choices, and if they are pasted in at some later point where columns are picked differently - the rules will still work because you are replacing the initial column definitions. The initial rules implementation didn't have this concept of loading columns from metadata - but this was added to support loading existing identifiers as part of the "Apply Rules to Existing Collection" tool. This commit extends that idea to do the same thing (but with different columns) when loading data from HDAs, FTP, and data libraries. Commit: c5ab87ee5909e0871fb62fcb2e82cdaecf5f8166 https://github.com/galaxyproject/galaxy/commit/c5ab87ee5909e0871fb62fcb2e82c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-05-14 (Mon, 14 May 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select.js Log Message: ----------- Fix repeated additions of the separator, define vars. Commit: 9789aa7d637f8e0a1de558f01ef90a136f7e79a3 https://github.com/galaxyproject/galaxy/commit/9789aa7d637f8e0a1de558f01ef90... Author: Aysam Guerler <aysam.guerler@gmail.com> Date: 2018-05-14 (Mon, 14 May 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select.js Log Message: ----------- Merge pull request #26 from dannon/max_select2_length Fix a minor bug, a little bit of cleanup. Commit: b0d730fa76cf8392a19cea5fe08a72aab2fccc2a https://github.com/galaxyproject/galaxy/commit/b0d730fa76cf8392a19cea5fe08a7... Author: Dannon <dannon.baker@gmail.com> Date: 2018-05-14 (Mon, 14 May 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select.js Log Message: ----------- Merge pull request #6130 from guerler/max_select2_length [18.05] Limit select2 text label length to 100 characters Commit: e5ea32465a64fed1acfa63b7385272a6f9ccee15 https://github.com/galaxyproject/galaxy/commit/e5ea32465a64fed1acfa63b738527... Author: John Chilton <jmchilton@gmail.com> Date: 2018-05-14 (Mon, 14 May 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- More validation for rule builder. - Require a URL or FTP column for raw pasted data. - Require list identifiers if creating collections. - Require name in more scenerios that require a name. Commit: 5c036bc2647799c70b11b2a4e4ce0fae8d103cdc https://github.com/galaxyproject/galaxy/commit/5c036bc2647799c70b11b2a4e4ce0... Author: Dannon <dannon.baker@gmail.com> Date: 2018-05-14 (Mon, 14 May 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- Merge pull request #6133 from jmchilton/rule_fixes_7 [18.05] Improve dialog message while waiting for rule builder job. Commit: 076e1ddaecd4f2744346c503b0108d8189f35bd1 https://github.com/galaxyproject/galaxy/commit/076e1ddaecd4f2744346c503b0108... Author: Dannon <dannon.baker@gmail.com> Date: 2018-05-15 (Tue, 15 May 2018) Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue Log Message: ----------- Merge pull request #6136 from jmchilton/rule_fixes_9 [18.05] More validation for rule builder. Commit: 3d6443b58bfa0200cf775b569c542be326476493 https://github.com/galaxyproject/galaxy/commit/3d6443b58bfa0200cf775b569c542... Author: Dannon <dannon.baker@gmail.com> Date: 2018-05-15 (Tue, 15 May 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 M client/galaxy/scripts/mvc/upload/collection/rules-input-view.js Log Message: ----------- Merge pull request #6134 from jmchilton/rule_fixes_8 Improve data initialization of rule builder for long term support. Commit: 6a1057e95f5e46cbd676aaf6dbfe3a4df706d9c3 https://github.com/galaxyproject/galaxy/commit/6a1057e95f5e46cbd676aaf6dbfe3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-05-15 (Tue, 15 May 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 M client/galaxy/scripts/mvc/ui/ui-select.js M client/galaxy/scripts/mvc/upload/collection/rules-input-view.js Log Message: ----------- Merge remote-tracking branch 'upstream/release_18.05' into dev Compare: https://github.com/galaxyproject/galaxy/compare/7077851e9813...6a1057e95f5e **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.