galaxy-commits April 2017

galaxy-commits@lists.galaxyproject.org

1 participants
120 discussions

[galaxyproject/galaxy] 200994: Revert "Allows to drag-and-drop history items into...
by GitHub 05 Apr '17

05 Apr '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 200994536e6110fffb586a968edf7edd3c04e4f2 https://github.com/galaxyproject/galaxy/commit/200994536e6110fffb586a968edf… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-04-05 (Wed, 05 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/style/less/ui.less M static/maps/mvc/history/history-view-edit.js.map M static/maps/mvc/ui/ui-select-content.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/history/history-view-edit.js M static/scripts/mvc/ui/ui-select-content.js M static/style/blue/base.css Log Message: ----------- Revert "Allows to drag-and-drop history items into the content selector" Commit: 8bbd423909d7ed524b2f73cdc7f7bf42b49c43f2 https://github.com/galaxyproject/galaxy/commit/8bbd423909d7ed524b2f73cdc7f7… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-04-05 (Wed, 05 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/style/less/ui.less M static/maps/mvc/history/history-view-edit.js.map M static/maps/mvc/ui/ui-select-content.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/history/history-view-edit.js M static/scripts/mvc/ui/ui-select-content.js M static/style/blue/base.css Log Message: ----------- Merge pull request #3877 from galaxyproject/revert-3871-history_drag_drop Revert "Allows to drag-and-drop history items into the content selector" Compare: https://github.com/galaxyproject/galaxy/compare/c27dac65c882...8bbd423909d7

1 0

[galaxyproject/galaxy] d9f21f: Only fail through to client mapping when it exists...
by GitHub 05 Apr '17

05 Apr '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d9f21fd34c059d422e63d31e9fb94660e826c4ff https://github.com/galaxyproject/galaxy/commit/d9f21fd34c059d422e63d31e9fb9… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Only fail through to client mapping when it exists. Commit: c27dac65c882906aa87c364961ac7783f1babd17 https://github.com/galaxyproject/galaxy/commit/c27dac65c882906aa87c364961ac… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-04-05 (Wed, 05 Apr 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Merge pull request #3783 from dannon/routing_bug_exception_propagation Layered routing fix for when controller route fails and client route does not exist. Compare: https://github.com/galaxyproject/galaxy/compare/6251b51aebc8...c27dac65c882

1 0

[galaxyproject/galaxy] 200994: Revert "Allows to drag-and-drop history items into...
by GitHub 05 Apr '17

05 Apr '17

Branch: refs/heads/revert-3871-history_drag_drop Home: https://github.com/galaxyproject/galaxy Commit: 200994536e6110fffb586a968edf7edd3c04e4f2 https://github.com/galaxyproject/galaxy/commit/200994536e6110fffb586a968edf… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-04-05 (Wed, 05 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/style/less/ui.less M static/maps/mvc/history/history-view-edit.js.map M static/maps/mvc/ui/ui-select-content.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/history/history-view-edit.js M static/scripts/mvc/ui/ui-select-content.js M static/style/blue/base.css Log Message: ----------- Revert "Allows to drag-and-drop history items into the content selector"

1 0

[galaxyproject/galaxy] 2b0ac9: Enable drag drop for history items
by GitHub 05 Apr '17

05 Apr '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2b0ac9a098b7ca2c207c3d00be698a993e4130ff https://github.com/galaxyproject/galaxy/commit/2b0ac9a098b7ca2c207c3d00be69… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-view-edit.js M static/maps/mvc/history/history-view-edit.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/history/history-view-edit.js Log Message: ----------- Enable drag drop for history items Commit: 97d5a86a585b2c9ac159c9db255dd0389f83ab3b https://github.com/galaxyproject/galaxy/commit/97d5a86a585b2c9ac159c9db255d… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js Log Message: ----------- Catch drag and drop basic event handlers for content selector Commit: aa7bed3b7270db18505e1dc7a8f84600482114cb https://github.com/galaxyproject/galaxy/commit/aa7bed3b7270db18505e1dc7a8f8… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/style/less/ui.less M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js M static/style/blue/base.css Log Message: ----------- Add basic styles to highlight drop area on drag over Commit: f56651b9ea8b20e34d1cb0604888d3de2e49e2c4 https://github.com/galaxyproject/galaxy/commit/f56651b9ea8b20e34d1cb0604888… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js Log Message: ----------- Access drop data Commit: 642002854c2abd312e917632191c7db638234ad7 https://github.com/galaxyproject/galaxy/commit/642002854c2abd312e917632191c… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js Log Message: ----------- Move drop handler, support datasets and collections Commit: 5bbc91289b0d5cd69a00a487751f4782f298932a https://github.com/galaxyproject/galaxy/commit/5bbc91289b0d5cd69a00a487751f… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/style/less/ui.less M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js M static/style/blue/base.css Log Message: ----------- Display success and error colors Commit: 039f706bd7395f8b0350453936f2e82f98fa4e93 https://github.com/galaxyproject/galaxy/commit/039f706bd7395f8b0350453936f2… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/style/less/ui.less M static/style/blue/base.css Log Message: ----------- Fix style color on inital dragover Commit: af066197b9b9a4ff6f804fe4cc588611eab0ddd9 https://github.com/galaxyproject/galaxy/commit/af066197b9b9a4ff6f804fe4cc58… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js Log Message: ----------- Improve validation Commit: da0d53728be70d26123a748546a8c0d6cb8d67c3 https://github.com/galaxyproject/galaxy/commit/da0d53728be70d26123a748546a8… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js Log Message: ----------- Move delay timer value to attributes, rename status handler Commit: e05036a6a02c396c207c9ea80dc056a58c9f7f08 https://github.com/galaxyproject/galaxy/commit/e05036a6a02c396c207c9ea80dc0… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js M static/style/blue/base.css Log Message: ----------- Avoid flickering due to bubbling events from children without masking div Commit: 5c85fe1c9821a12caaef30df37eeac3c1fcb2a66 https://github.com/galaxyproject/galaxy/commit/5c85fe1c9821a12caaef30df37ee… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js Log Message: ----------- Remove unused default behavior blockers Commit: 2c3cdfb6d0355667909a40a79c8e02a76b6dca97 https://github.com/galaxyproject/galaxy/commit/2c3cdfb6d0355667909a40a79c8e… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js Log Message: ----------- Fix code style, improve readability Commit: 071186d520fdd0069b182dd77aeaad4bddd1e323 https://github.com/galaxyproject/galaxy/commit/071186d520fdd0069b182dd77aea… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/style/less/ui.less M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js M static/style/blue/base.css Log Message: ----------- Improve support for multiple dataset selector Commit: 383db9bb3bedef57f490dff4feb1bd74188c798b https://github.com/galaxyproject/galaxy/commit/383db9bb3bedef57f490dff4feb1… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M static/maps/mvc/ui/ui-select-content.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/ui/ui-select-content.js Log Message: ----------- Trigger change to update current selection if value has not actually changed Commit: 6251b51aebc8719b64122e1311175e683e55bbb3 https://github.com/galaxyproject/galaxy/commit/6251b51aebc8719b64122e131117… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-04-05 (Wed, 05 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/style/less/ui.less M static/maps/mvc/history/history-view-edit.js.map M static/maps/mvc/ui/ui-select-content.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/history/history-view-edit.js M static/scripts/mvc/ui/ui-select-content.js M static/style/blue/base.css Log Message: ----------- Merge pull request #3871 from guerler/history_drag_drop Allows to drag-and-drop history items into the content selector Compare: https://github.com/galaxyproject/galaxy/compare/5937a677d57e...6251b51aebc8

1 0

[galaxyproject/galaxy] d1974a: Use detect_errors="exit_code" in Trim tool
by GitHub 04 Apr '17

04 Apr '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d1974a42e5787ef06d4c4d25dbe7178eb26284d5 https://github.com/galaxyproject/galaxy/commit/d1974a42e5787ef06d4c4d25dbe7… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M tools/filters/trimmer.py M tools/filters/trimmer.xml Log Message: ----------- Use detect_errors="exit_code" in Trim tool Prevent job failures due to spurious messages on stderr from the cluster scheduler. Commit: 5937a677d57e6180aaeabcd737e70aac0809fbd5 https://github.com/galaxyproject/galaxy/commit/5937a677d57e6180aaeabcd737e7… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M tools/filters/trimmer.py M tools/filters/trimmer.xml Log Message: ----------- Merge pull request #3869 from nsoranzo/trimmer Use detect_errors="exit_code" in Trim tool Compare: https://github.com/galaxyproject/galaxy/compare/41a88de7527c...5937a677d57e

1 0

[galaxyproject/infrastructure-playbook] 03eb97: Update common roles and fixes for that update
by GitHub 04 Apr '17

04 Apr '17

Branch: refs/heads/master Home: https://github.com/galaxyproject/infrastructure-playbook Commit: 03eb97c687114238d4afaf4d20c53019ee7c7f17 https://github.com/galaxyproject/infrastructure-playbook/commit/03eb97c6871… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M common_roles M galaxyenv/host_vars/chouffe.galaxyproject.org.yml M galaxyenv/host_vars/delirium.galaxyproject.org.yml R library/yum_repository Log Message: ----------- Update common roles and fixes for that update Commit: 275b525e0c21fb3f45e61873dbb6d95c1b4b85ec https://github.com/galaxyproject/infrastructure-playbook/commit/275b525e0c2… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M roles/cvmfs/tasks/client.yml Log Message: ----------- Don't unnecessarily run cvmfs_config setup Commit: b3db2254a57dfc2a75fdc8ec4317eaae24118b62 https://github.com/galaxyproject/infrastructure-playbook/commit/b3db2254a57… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M roles/slurm/tasks/main.yml M taccenv/group_vars/slurmclients.yml Log Message: ----------- Slurm role improvements: - Have it create its own user account if so configured, since relying on the users common role tramples other group_users configs. - Don't have it set up its own yum repo since the same yum repo is used by other things and was being used multiple times. Commit: b17840d747965b873fd0e0d84c37b320b98f64a3 https://github.com/galaxyproject/infrastructure-playbook/commit/b17840d7479… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M taccenv/playbook.yml Log Message: ----------- Better use of tags Commit: 6318da492b5cda52693332e462d4fd9da7acc083 https://github.com/galaxyproject/infrastructure-playbook/commit/6318da492b5… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M galaxyenv/host_vars/cvmfs0-psu0.galaxyproject.org.yml M galaxyenv/host_vars/cvmfs0-tacc0.galaxyproject.org.yml M taccenv/group_vars/galaxyservers.yml Log Message: ----------- Install the Galaxy EL yum repo via the packages role Commit: 21601edfc91d2ade0bf96b53d201ff64ba15d937 https://github.com/galaxyproject/infrastructure-playbook/commit/21601edfc91… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M taccenv/secret_group_vars/testgalaxyservers.yml Log Message: ----------- Update Test access lists Commit: 0a9963fe69db97a7e66f36cf02d6af069dc21332 https://github.com/galaxyproject/infrastructure-playbook/commit/0a9963fe69d… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: A taccenv/host_vars/galaxy07.tacc.utexas.edu.yml M taccenv/inventory Log Message: ----------- Set up galaxy07 as new Galaxy Test server Commit: 09b1b64d0e35d3399668b2b5181b94b9c7649b3b https://github.com/galaxyproject/infrastructure-playbook/commit/09b1b64d0e3… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M jetstreamdockerenv/group_vars/baseinstances.yml Log Message: ----------- Switch base instance for Jetstream GIE docker swarm Compare: https://github.com/galaxyproject/infrastructure-playbook/compare/922a0a6e94…

1 0

[galaxyproject/galaxy] c51adf: Insert update caller/helper for options
by GitHub 04 Apr '17

04 Apr '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c51adf781a1a711c4e54d89fbdca7ea9d3331f08 https://github.com/galaxyproject/galaxy/commit/c51adf781a1a711c4e54d89fbdca… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-03-30 (Thu, 30 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-options.js M static/maps/mvc/ui/ui-options.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-options.js Log Message: ----------- Insert update caller/helper for options Commit: c8eb2c186def4b505143a5a6b0d971549b15d19a https://github.com/galaxyproject/galaxy/commit/c8eb2c186def4b505143a5a6b0d9… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-03-31 (Fri, 31 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-options.js M static/maps/mvc/ui/ui-options.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-options.js Log Message: ----------- Merge pull request #3851 from guerler/add_lost_update_caller [17.01] Fix update caller/helper for options Commit: 99c8f2c9fc6f335863f134a5b8b4055d5079cfe1 https://github.com/galaxyproject/galaxy/commit/99c8f2c9fc6f335863f134a5b8b4… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-03-31 (Fri, 31 Mar 2017) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Fix setting UUID on steps when copying steps from another workflow. It seems like the client is correctly setting the UUID to None, but the backend is treating the None as a UUID because it was (incorrectly IMO) making a distinction between ``uuid`` being absent and being set to ``None``. Fixes #3845. Commit: 268aac29526b3526a42457576e8de7867c2bfe1f https://github.com/galaxyproject/galaxy/commit/268aac29526b3526a42457576e8d… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Merge pull request #3856 from jmchilton/1701_uuid_on_copy_fix [17.01] Fix setting UUID on steps when copying steps from another workflow. Commit: 5b46c431b416e619a7ac5467527ab30743eabd33 https://github.com/galaxyproject/galaxy/commit/5b46c431b416e619a7ac5467527a… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Fix certain aspects of dataset reductions in conditionals/repeats. For instance, fixes #3859 restoring the correct ``element_identifier`` for reduces collections in conditionals. Add tests for combinations of repeats and conditionals. Commit: 3c080cae96aadccd824aa7cf6fda9c4b5bf7471a https://github.com/galaxyproject/galaxy/commit/3c080cae96aadccd824aa7cf6fda… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #3864 from jmchilton/fix_identifiers_in_conditionals [17.01] Fix certain aspects of collection reductions in conditionals/repeats. Commit: 41a88de7527c4e5f38070fe31e0dfe78ad817603 https://github.com/galaxyproject/galaxy/commit/41a88de7527c4e5f38070fe31e0d… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-options.js M lib/galaxy/managers/workflows.py M lib/galaxy/tools/actions/__init__.py M static/maps/mvc/ui/ui-options.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/ui/ui-options.js M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge branch 'release_17.01' into dev Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map Compare: https://github.com/galaxyproject/galaxy/compare/5d810d5908ac...41a88de7527c

1 0

[galaxyproject/galaxy] 1e7021: Touch up #3559 based on post-merge discussions.
by GitHub 04 Apr '17

04 Apr '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 1e70211fa4827badf4bd3fe1f1703004d369afec https://github.com/galaxyproject/galaxy/commit/1e70211fa4827badf4bd3fe1f170… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/webapps/galaxy/api/folder_contents.py M lib/galaxy/webapps/galaxy/api/library_contents.py M test/api/test_libraries.py Log Message: ----------- Touch up #3559 based on post-merge discussions. Commit: 5d810d5908ac851e398ebc7fcd7d54c5a892fd04 https://github.com/galaxyproject/galaxy/commit/5d810d5908ac851e398ebc7fcd7d… Author: Marius van den Beek <m.vandenbeek(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M lib/galaxy/webapps/galaxy/api/folder_contents.py M lib/galaxy/webapps/galaxy/api/library_contents.py M test/api/test_libraries.py Log Message: ----------- Merge pull request #3857 from jmchilton/3559_touchups Touch up #3559 based on post-merge discussions. Compare: https://github.com/galaxyproject/galaxy/compare/6f4e242b1648...5d810d5908ac

1 0

[galaxyproject/galaxy] 283915: Adding Phylocanvas visualization for the Galaxy ch...
by GitHub 04 Apr '17

04 Apr '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2839153eb4b08f0b9a536059912d39fd3ee902a0 https://github.com/galaxyproject/galaxy/commit/2839153eb4b08f0b9a536059912d… Author: anuprulez <anup.rulez(a)gmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: A config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js A config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js.map M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M config/plugins/visualizations/charts/static/repository/build/registry.tmp.js A config/plugins/visualizations/charts/static/repository/plugins/biojs/phylocanvas/phylocanvas.js M config/plugins/visualizations/charts/static/repository/registry.json A config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/config.js A config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/logo.png A config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/wrapper.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Adding Phylocanvas visualization for the Galaxy charts Commit: 876c7a2d3df70b1c4edcf4fe738eb51c6e76bcfa https://github.com/galaxyproject/galaxy/commit/876c7a2d3df70b1c4edcf4fe738e… Author: anuprulez <anup.rulez(a)gmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js.map M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/config.js M config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/logo.png M config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/wrapper.js Log Message: ----------- Adding more features like colors, collapse, prune and resize of the tree Commit: 8e1d761beccfc301129070f2c5c0a79939d290a0 https://github.com/galaxyproject/galaxy/commit/8e1d761beccfc301129070f2c5c0… Author: anuprulez <anup.rulez(a)gmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: A config/plugins/interactive_environments/ethercalc/config/allowed_images.yml.sample M config/plugins/interactive_environments/ethercalc/config/ethercalc.ini.sample M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js.map R config/plugins/visualizations/charts/static/repository/build/cytoscape_basic.js R config/plugins/visualizations/charts/static/repository/build/cytoscape_basic.js.map A config/plugins/visualizations/charts/static/repository/build/cytoscape_viewer.js A config/plugins/visualizations/charts/static/repository/build/cytoscape_viewer.js.map M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M config/plugins/visualizations/charts/static/repository/build/registry.tmp.js M config/plugins/visualizations/charts/static/repository/registry.json A config/plugins/visualizations/charts/static/repository/utilities/sifjson.js M config/plugins/visualizations/charts/static/repository/utilities/utils.js R config/plugins/visualizations/charts/static/repository/visualizations/cytoscape/basic/config.js R config/plugins/visualizations/charts/static/repository/visualizations/cytoscape/basic/logo.png R config/plugins/visualizations/charts/static/repository/visualizations/cytoscape/basic/wrapper.js A config/plugins/visualizations/charts/static/repository/visualizations/cytoscape/viewer/config.js A config/plugins/visualizations/charts/static/repository/visualizations/cytoscape/viewer/logo.png A config/plugins/visualizations/charts/static/repository/visualizations/cytoscape/viewer/wrapper.js M display_applications/igv/bigwig.xml M doc/source/admin/framework_dependencies.rst M doc/source/admin/index.rst A doc/source/admin/reports.md M doc/source/admin/useful_scripts.rst A doc/source/api/api.rst A doc/source/api/ts_api.rst M doc/source/api_doc.rst M doc/source/conf.py M doc/source/index.rst R doc/source/lib/galaxy.webapps.galaxy.api.rst R doc/source/lib/galaxy.webapps.tool_shed.api.rst M doc/source/releases/_header.rst M doc/source/ts_api_doc.rst M lib/galaxy/tools/__init__.py Log Message: ----------- Merging with dev Commit: 2f66d4563e02e8b585e5c1529b4e414117846858 https://github.com/galaxyproject/galaxy/commit/2f66d4563e02e8b585e5c1529b4e… Author: anuprulez <anup.rulez(a)gmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js.map M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/config.js M config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/wrapper.js Log Message: ----------- Adding shapes for leaves of phylogenetic tree Commit: e67dc45c26e77d3f2b85ac7e2ab80ac5fdab0cf9 https://github.com/galaxyproject/galaxy/commit/e67dc45c26e77d3f2b85ac7e2ab8… Author: anuprulez <anup.rulez(a)gmail.com> Date: 2017-03-30 (Thu, 30 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/collection/base-creator.js M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/collection/pair-collection-creator.js M client/galaxy/scripts/mvc/history/history-view-edit.js A client/galaxy/scripts/mvc/upload/collection/collection-row.js A client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/scripts/mvc/upload/upload-view.js M client/galaxy/style/less/upload.less M lib/galaxy/tools/parameters/basic.py M static/maps/mvc/collection/base-creator.js.map M static/maps/mvc/collection/list-collection-creator.js.map M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/maps/mvc/collection/pair-collection-creator.js.map M static/maps/mvc/history/history-view-edit.js.map A static/maps/mvc/upload/collection/collection-row.js.map A static/maps/mvc/upload/collection/collection-view.js.map M static/maps/mvc/upload/upload-view.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/collection/base-creator.js M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/scripts/mvc/collection/pair-collection-creator.js M static/scripts/mvc/history/history-view-edit.js A static/scripts/mvc/upload/collection/collection-row.js A static/scripts/mvc/upload/collection/collection-view.js M static/scripts/mvc/upload/upload-view.js M static/style/blue/base.css M test/galaxy_selenium/navigates_galaxy.py M test/selenium_tests/test_collection_builders.py M test/selenium_tests/test_uploads.py M test/shed_functional/functional/test_1090_repository_dependency_handling.py Log Message: ----------- Merge branch 'dev' of https://github.com/bgruening/galaxy into phylocanvas Commit: fa086edf22c725b8a98cff92ac6ca6a4ab210237 https://github.com/galaxyproject/galaxy/commit/fa086edf22c725b8a98cff92ac6c… Author: anuprulez <anup.rulez(a)gmail.com> Date: 2017-03-31 (Fri, 31 Mar 2017) Changed paths: M config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js.map M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/config.js Log Message: ----------- Adding support for .nhx files (Newick) and removing txt files support Commit: 0c3f7989bb913842e28a8fbb267d1280420caa92 https://github.com/galaxyproject/galaxy/commit/0c3f7989bb913842e28a8fbb267d… Author: anuprulez <anup.rulez(a)gmail.com> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M .ci/flake8_lint_include_list.txt M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/util/gff_util.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M templates/webapps/galaxy/admin/manage_dependencies.mako M test/api/test_workflows.py M test/api/test_workflows_from_yaml.py M test/base/data/test_workflow_pause.ga M test/base/populators.py A test/integration/test_maximum_worklfow_invocation_duration.py Log Message: ----------- Merging wtih dev Commit: 339566bc03f1a51c7a4c60c2d6a100f43e1d3c15 https://github.com/galaxyproject/galaxy/commit/339566bc03f1a51c7a4c60c2d6a1… Author: anuprulez <anup.rulez(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M CONTRIBUTING.md M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/jobs/__init__.py M lib/galaxy/model/__init__.py M lib/galaxy/workflow/scheduling_manager.py M test/api/test_users.py M test/api/test_workflows.py A test/integration/test_workflow_handler_configuration.py A test/integration/workflow_handler_configuration_job_conf.xml Log Message: ----------- Merging with dev Commit: 6f4e242b16487b6032347dad3f60fef00f60464f https://github.com/galaxyproject/galaxy/commit/6f4e242b16487b6032347dad3f60… Author: Aysam Guerler <aysam.guerler(a)gmail.com> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: A config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js A config/plugins/visualizations/charts/static/repository/build/biojs_phylocanvas.js.map M config/plugins/visualizations/charts/static/repository/build/registry.js M config/plugins/visualizations/charts/static/repository/build/registry.js.map M config/plugins/visualizations/charts/static/repository/build/registry.tmp.js A config/plugins/visualizations/charts/static/repository/plugins/biojs/phylocanvas/phylocanvas.js M config/plugins/visualizations/charts/static/repository/registry.json A config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/config.js A config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/logo.png A config/plugins/visualizations/charts/static/repository/visualizations/biojs/phylocanvas/wrapper.js Log Message: ----------- Merge pull request #3850 from bgruening/phylocanvas Phylocanvas as a BioJS component for the Galaxy charts Compare: https://github.com/galaxyproject/galaxy/compare/5169fbe917c9...6f4e242b1648

1 0

[galaxyproject/galaxy] 5b46c4: Fix certain aspects of dataset reductions in condi...
by GitHub 03 Apr '17

03 Apr '17

Branch: refs/heads/usegalaxy Home: https://github.com/galaxyproject/galaxy Commit: 5b46c431b416e619a7ac5467527ab30743eabd33 https://github.com/galaxyproject/galaxy/commit/5b46c431b416e619a7ac5467527a… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Fix certain aspects of dataset reductions in conditionals/repeats. For instance, fixes #3859 restoring the correct ``element_identifier`` for reduces collections in conditionals. Add tests for combinations of repeats and conditionals. Commit: 3c080cae96aadccd824aa7cf6fda9c4b5bf7471a https://github.com/galaxyproject/galaxy/commit/3c080cae96aadccd824aa7cf6fda… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #3864 from jmchilton/fix_identifiers_in_conditionals [17.01] Fix certain aspects of collection reductions in conditionals/repeats. Commit: 83c8291976048ee1bec4047963b82ae805292b99 https://github.com/galaxyproject/galaxy/commit/83c8291976048ee1bec4047963b8… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #3867 from galaxyproject/release_17.01 [usegalaxy] merge Release 17.01 Compare: https://github.com/galaxyproject/galaxy/compare/aafb8e305ace...83c829197604

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

galaxy-commits April 2017