Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 3edc8b027537f3fbf9e8ac4d2bd68713786d0efc
https://github.com/galaxyproject/galaxy/commit/3edc8b027537f3fbf9e8ac4d2bd6…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2017-05-22 (Mon, 22 May 2017)
Changed paths:
M lib/galaxy/web/framework/helpers/grids.py
Log Message:
-----------
Modify grids helper, return dictionary instead of html
Commit: b65e56e688bb82076b678faa374d692bf2901264
https://github.com/galaxyproject/galaxy/commit/b65e56e688bb82076b678faa374d…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2017-05-22 (Mon, 22 May 2017)
Changed paths:
M client/webpack.config.js
Log Message:
-----------
Add autocomplete to common libraries
Commit: 9312f8eaf625753ad5ce790b881b9458cda70ead
https://github.com/galaxyproject/galaxy/commit/9312f8eaf625753ad5ce790b881b…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2017-05-22 (Mon, 22 May 2017)
Changed paths:
M client/galaxy/scripts/mvc/grid/grid-view.js
M static/maps/mvc/grid/grid-view.js.map
M static/scripts/bundled/admin.bundled.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.map
M static/scripts/mvc/grid/grid-view.js
M templates/grid_base.mako
Log Message:
-----------
Move global tag function into grid view
Commit: c33bf7065753e6a6d22f72cd1ae5e9e9eb0a042f
https://github.com/galaxyproject/galaxy/commit/c33bf7065753e6a6d22f72cd1ae5…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2017-05-22 (Mon, 22 May 2017)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/layout/menu.js
M client/galaxy/scripts/mvc/grid/grid-view.js
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/page.py
M static/maps/layout/menu.js.map
M static/maps/mvc/grid/grid-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/layout/menu.js
M static/scripts/mvc/grid/grid-view.js
R templates/webapps/galaxy/page/list_published.mako
Log Message:
-----------
Use makoless grid for published page list
Commit: b2e517e41d342baa278e0516e5197abe6cc4a854
https://github.com/galaxyproject/galaxy/commit/b2e517e41d342baa278e0516e519…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2017-05-22 (Mon, 22 May 2017)
Changed paths:
M client/galaxy/scripts/mvc/grid/grid-template.js
M client/galaxy/scripts/mvc/grid/grid-view.js
M lib/galaxy/web/framework/helpers/grids.py
M static/maps/mvc/grid/grid-template.js.map
M static/maps/mvc/grid/grid-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.map
M static/scripts/mvc/grid/grid-template.js
M static/scripts/mvc/grid/grid-view.js
M templates/grid_base.mako
Log Message:
-----------
Remove unused properties in new format
Commit: f5671be1cfc683790aabe0c9b1c7d6605ef7ead4
https://github.com/galaxyproject/galaxy/commit/f5671be1cfc683790aabe0c9b1c7…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2017-05-22 (Mon, 22 May 2017)
Changed paths:
M lib/galaxy/web/framework/helpers/grids.py
Log Message:
-----------
Remove semicolon
Commit: b764d35cf7f442c25e3d7fadd10743b281b3b3a9
https://github.com/galaxyproject/galaxy/commit/b764d35cf7f442c25e3d7fadd107…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2017-05-30 (Tue, 30 May 2017)
Changed paths:
M CONTRIBUTORS.md
M client/galaxy/scripts/apps/analysis.js
A client/galaxy/scripts/mvc/workflow/workflow-configure-menu.js
M client/galaxy/scripts/mvc/workflow/workflow.js
M client/galaxy/style/less/base.less
A doc/source/releases/17.05.rst
M doc/source/releases/17.05_announce.rst
A doc/source/releases/17.09_announce.rst
M doc/source/releases/_thanks.rst
M doc/source/releases/index.rst
M doc/source/releases/older_releases.rst
M lib/galaxy/datatypes/converters/cml_to_inchi_converter.xml
M lib/galaxy/datatypes/converters/cml_to_mol2_converter.xml
M lib/galaxy/datatypes/converters/cml_to_sdf_converter.xml
M lib/galaxy/datatypes/converters/cml_to_smi_converter.xml
M lib/galaxy/datatypes/converters/inchi_to_cml_converter.xml
M lib/galaxy/datatypes/converters/inchi_to_mol2_converter.xml
M lib/galaxy/datatypes/converters/inchi_to_mol_converter.xml
M lib/galaxy/datatypes/converters/inchi_to_sdf_converter.xml
M lib/galaxy/datatypes/converters/inchi_to_smi_converter.xml
M lib/galaxy/datatypes/converters/mol2_to_cml_converter.xml
M lib/galaxy/datatypes/converters/mol2_to_inchi_converter.xml
M lib/galaxy/datatypes/converters/mol2_to_mol_converter.xml
M lib/galaxy/datatypes/converters/mol2_to_sdf_converter.xml
M lib/galaxy/datatypes/converters/mol2_to_smi_converter.xml
M lib/galaxy/datatypes/converters/mol_to_cml_converter.xml
M lib/galaxy/datatypes/converters/mol_to_inchi_converter.xml
M lib/galaxy/datatypes/converters/mol_to_mol2_converter.xml
M lib/galaxy/datatypes/converters/mol_to_smi_converter.xml
M lib/galaxy/datatypes/converters/sdf_to_cml_converter.xml
M lib/galaxy/datatypes/converters/sdf_to_inchi_converter.xml
M lib/galaxy/datatypes/converters/sdf_to_mol2_converter.xml
M lib/galaxy/datatypes/converters/sdf_to_smi_converter.xml
M lib/galaxy/datatypes/converters/smi_to_cml_converter.xml
M lib/galaxy/datatypes/converters/smi_to_inchi_converter.xml
M lib/galaxy/datatypes/converters/smi_to_mol2_converter.xml
M lib/galaxy/datatypes/converters/smi_to_mol_converter.xml
M lib/galaxy/datatypes/converters/smi_to_sdf_converter.xml
M lib/galaxy/datatypes/converters/smi_to_smi_converter.xml
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/jobs/runners/drmaa.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/parameters/__init__.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/tool_shed/galaxy_install/install_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/env_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
M lib/tool_shed/metadata/metadata_generator.py
A static/maps/mvc/workflow/workflow-configure-menu.js.map
M static/maps/mvc/workflow/workflow.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
A static/scripts/mvc/workflow/workflow-configure-menu.js
M static/scripts/mvc/workflow/workflow.js
M static/style/blue/base.css
R templates/webapps/galaxy/workflow/configure_menu.mako
Log Message:
-----------
Merge branch 'dev' into remove_grids_mako
Commit: e8f730895c34dde4956ac816feec32ab0fdce1ae
https://github.com/galaxyproject/galaxy/commit/e8f730895c34dde4956ac816feec…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-02 (Fri, 02 Jun 2017)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/layout/menu.js
M client/galaxy/scripts/mvc/grid/grid-template.js
M client/galaxy/scripts/mvc/grid/grid-view.js
M client/webpack.config.js
M lib/galaxy/web/framework/helpers/grids.py
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/page.py
M static/maps/layout/menu.js.map
M static/maps/mvc/grid/grid-template.js.map
M static/maps/mvc/grid/grid-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/layout/menu.js
M static/scripts/mvc/grid/grid-template.js
M static/scripts/mvc/grid/grid-view.js
M templates/grid_base.mako
R templates/webapps/galaxy/page/list_published.mako
Log Message:
-----------
Merge remote-tracking branch 'guerler/remove_grids_mako' into dev
Compare: https://github.com/galaxyproject/galaxy/compare/d807ed0f75c6...e8f730895c34
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: c260e0b0c8ec1b8c479ab2aa2f60b7dfd533b324
https://github.com/galaxyproject/galaxy/commit/c260e0b0c8ec1b8c479ab2aa2f60…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/history/hda-li.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/history/hda-li.js.map
M static/maps/mvc/history/hdca-li.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.map
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/history/hda-li.js
M static/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Sort tags for display (note, this is stupid to have in 3 places -- refactor)
Commit: 967c363786f36a4d4aab020a073b7c5e7eefbce6
https://github.com/galaxyproject/galaxy/commit/967c363786f36a4d4aab020a073b…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M lib/galaxy/jobs/actions/post.py
Log Message:
-----------
Filter tags for empties (fixes #4127)
Commit: 0c43954e8d09f9f6dc7ac3af02b14821e8fc53ae
https://github.com/galaxyproject/galaxy/commit/0c43954e8d09f9f6dc7ac3af02b1…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M lib/galaxy/jobs/actions/post.py
Log Message:
-----------
Slight tweak of logic in tag filtering PJA
Commit: 12905321ca8083e4b41eb0fe03193463b8efb019
https://github.com/galaxyproject/galaxy/commit/12905321ca8083e4b41eb0fe0319…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M lib/galaxy/jobs/actions/post.py
Log Message:
-----------
Allow hashtag usage in workflow PJA tag addition mechanism
Commit: 0954290e5dfe74ab4d7a658dca9e2896e7aa020e
https://github.com/galaxyproject/galaxy/commit/0954290e5dfe74ab4d7a658dca9e…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M lib/galaxy/jobs/actions/post.py
Log Message:
-----------
Combine list comprehensions, slightly tweak logic.
Commit: 0272e188a81b89d743c22956c88e6cdac433b8db
https://github.com/galaxyproject/galaxy/commit/0272e188a81b89d743c22956c88e…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2017-06-02 (Fri, 02 Jun 2017)
Changed paths:
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/history/hda-li.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M lib/galaxy/jobs/actions/post.py
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/history/hda-li.js.map
M static/maps/mvc/history/hdca-li.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.map
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/history/hda-li.js
M static/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Merge pull request #4139 from dannon/tag_sorting
[17.05] Tag fixes
Commit: d807ed0f75c6bc764a5a3a66b44172f34cd7b094
https://github.com/galaxyproject/galaxy/commit/d807ed0f75c6bc764a5a3a66b441…
Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk>
Date: 2017-06-02 (Fri, 02 Jun 2017)
Changed paths:
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/history/hda-li.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M lib/galaxy/jobs/actions/post.py
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/history/hda-li.js.map
M static/maps/mvc/history/hdca-li.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/dataset/dataset-li.js
M static/scripts/mvc/history/hda-li.js
M static/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Merge branch 'release_17.05' 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
static/scripts/bundled/login.bundled.js.map
Compare: https://github.com/galaxyproject/galaxy/compare/20d2303d3463...d807ed0f75c6
Branch: refs/heads/release_17.05
Home: https://github.com/galaxyproject/galaxy
Commit: c260e0b0c8ec1b8c479ab2aa2f60b7dfd533b324
https://github.com/galaxyproject/galaxy/commit/c260e0b0c8ec1b8c479ab2aa2f60…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/history/hda-li.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/history/hda-li.js.map
M static/maps/mvc/history/hdca-li.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.map
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/history/hda-li.js
M static/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Sort tags for display (note, this is stupid to have in 3 places -- refactor)
Commit: 967c363786f36a4d4aab020a073b7c5e7eefbce6
https://github.com/galaxyproject/galaxy/commit/967c363786f36a4d4aab020a073b…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M lib/galaxy/jobs/actions/post.py
Log Message:
-----------
Filter tags for empties (fixes #4127)
Commit: 0c43954e8d09f9f6dc7ac3af02b14821e8fc53ae
https://github.com/galaxyproject/galaxy/commit/0c43954e8d09f9f6dc7ac3af02b1…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M lib/galaxy/jobs/actions/post.py
Log Message:
-----------
Slight tweak of logic in tag filtering PJA
Commit: 12905321ca8083e4b41eb0fe03193463b8efb019
https://github.com/galaxyproject/galaxy/commit/12905321ca8083e4b41eb0fe0319…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M lib/galaxy/jobs/actions/post.py
Log Message:
-----------
Allow hashtag usage in workflow PJA tag addition mechanism
Commit: 0954290e5dfe74ab4d7a658dca9e2896e7aa020e
https://github.com/galaxyproject/galaxy/commit/0954290e5dfe74ab4d7a658dca9e…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M lib/galaxy/jobs/actions/post.py
Log Message:
-----------
Combine list comprehensions, slightly tweak logic.
Commit: 0272e188a81b89d743c22956c88e6cdac433b8db
https://github.com/galaxyproject/galaxy/commit/0272e188a81b89d743c22956c88e…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2017-06-02 (Fri, 02 Jun 2017)
Changed paths:
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/history/hda-li.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M lib/galaxy/jobs/actions/post.py
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/history/hda-li.js.map
M static/maps/mvc/history/hdca-li.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.map
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/history/hda-li.js
M static/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Merge pull request #4139 from dannon/tag_sorting
[17.05] Tag fixes
Compare: https://github.com/galaxyproject/galaxy/compare/b0c46cc4d0ec...0272e188a81b
Branch: refs/heads/master
Home: https://github.com/galaxyproject/infrastructure-playbook
Commit: 34639fc49f019f88483a8a2a4f18d5bfc226be15
https://github.com/galaxyproject/infrastructure-playbook/commit/34639fc49f0…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M galaxyenv/host_vars/cvmfs0-psu0.galaxyproject.org.yml
M galaxyenv/host_vars/cvmfs0-tacc0.galaxyproject.org.yml
M galaxyenv/playbook.yml
M galaxyenv/secret_host_vars/cvmfs0-psu0.galaxyproject.org.yml
M roles/cvmfs/defaults/main.yml
M roles/cvmfs/tasks/stratum0.yml
M roles/cvmfs/tasks/stratum1.yml
Log Message:
-----------
Updates for CVMFS 2.3(.5), disable auto garbage collection on publish/snapshot and schedule weekly collection (makes publishing/snapshotting, and therefore updating Galaxy, much quicker).
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: c409572ef8510e0c4322d835c5ba90f32bc9c653
https://github.com/galaxyproject/galaxy/commit/c409572ef8510e0c4322d835c5ba…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2017-05-31 (Wed, 31 May 2017)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
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.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Handle potential regex expression in workflow parameter names
Commit: a9d0d3671afc2be90509517b53b96af694ff22e5
https://github.com/galaxyproject/galaxy/commit/a9d0d3671afc2be90509517b53b9…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2017-05-31 (Wed, 31 May 2017)
Changed paths:
M lib/galaxy/util/compression_utils.py
Log Message:
-----------
Fix for returning a fileobject in compression_utils.py when handling a zipfile.
Will return the first named object in the archive. zipfile.os_zipfile does not exist...
Commit: f6ced00ef0de0fa67e2ecd06fa2db204e73f25ad
https://github.com/galaxyproject/galaxy/commit/f6ced00ef0de0fa67e2ecd06fa2d…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2017-05-31 (Wed, 31 May 2017)
Changed paths:
M lib/galaxy/util/compression_utils.py
Log Message:
-----------
Merge pull request #4135 from blankenberg/17.05_zipfile
[17.05] Fix for returning a fileobject in compression_utils.py when handling a zipfile.
Commit: 75028ac1eec7de53a197217921ebd5b7dac4daac
https://github.com/galaxyproject/galaxy/commit/75028ac1eec7de53a197217921eb…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-05-31 (Wed, 31 May 2017)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
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.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Merge pull request #4133 from guerler/escape_regex
[17.05] Properly escape potential regex expression in workflow parameters
Commit: c2348340cfa865ac33ed38311f22c0e8043c89ae
https://github.com/galaxyproject/galaxy/commit/c2348340cfa865ac33ed38311f22…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M lib/galaxy/tools/data/__init__.py
Log Message:
-----------
Fix for Data Tables loaded from a URL.
Commit: b0c46cc4d0ec554d10186050c91a5c8a4880a8ff
https://github.com/galaxyproject/galaxy/commit/b0c46cc4d0ec554d10186050c91a…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M lib/galaxy/tools/data/__init__.py
Log Message:
-----------
Merge pull request #4140 from blankenberg/17.05_data_tables_URL_fix
[17.05] Fix for Data Tables loaded from a URL.
Commit: 20d2303d34636b77d631eb3d1a99e3df8690d865
https://github.com/galaxyproject/galaxy/commit/20d2303d34636b77d631eb3d1a99…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M lib/galaxy/tools/data/__init__.py
M lib/galaxy/util/compression_utils.py
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Merge remote-tracking branch 'upstream/release_17.05' into dev
Compare: https://github.com/galaxyproject/galaxy/compare/c1d822d96de0...20d2303d3463
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 2f992d90ae8e0a4efec313fa0064b1576a26c2ba
https://github.com/galaxyproject/galaxy/commit/2f992d90ae8e0a4efec313fa0064…
Author: E Rasche <hxr(a)hx42.org>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M README.rst
M contrib/galaxy.debian-init
M contrib/galaxy_supervisor.conf
M doc/source/admin/authentication.md
M doc/source/admin/special_topics/mulled_containers.rst
M doc/source/dev/build_a_job_runner.rst
M doc/source/releases/13.01_announce.rst
M doc/source/releases/13.02_announce.rst
M doc/source/releases/13.04_announce.rst
M doc/source/releases/13.06_announce.rst
M doc/source/releases/13.08_announce.rst
M doc/source/releases/13.11_announce.rst
M doc/source/releases/14.02_announce.rst
M doc/source/releases/14.04_announce.rst
M doc/source/releases/14.06_announce.rst
M doc/source/releases/14.08_announce.rst
M doc/source/releases/14.10_announce.rst
M doc/source/releases/15.01_announce.rst
M doc/source/releases/15.03_announce.rst
M doc/source/releases/15.05.rst
M doc/source/releases/15.05_announce.rst
M doc/source/releases/15.07_announce.rst
M doc/source/releases/15.10_announce.rst
M doc/source/releases/16.01_announce.rst
M doc/source/releases/16.04_announce.rst
M doc/source/releases/16.07_announce.rst
M doc/source/releases/16.10_announce.rst
M doc/source/releases/17.01_announce.rst
M doc/source/slideshow/architecture/galaxy_architecture.md
M lib/galaxy/tools/xsd/README.md
M lib/galaxy/tools/xsd/galaxy.xsd
M scripts/bootstrap_history.py
M static/welcome.html.sample
M test/functional/tools/sample_datatypes_conf.xml
M test/qunit/test-data/bootstrapped.js
M test/qunit/tests/galaxy-app-base.js
Log Message:
-----------
Rebase
Commit: c1d822d96de0e97b39d5da4d51577d3823fdd8b1
https://github.com/galaxyproject/galaxy/commit/c1d822d96de0e97b39d5da4d5157…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M README.rst
M contrib/galaxy.debian-init
M contrib/galaxy_supervisor.conf
M doc/source/admin/authentication.md
M doc/source/admin/special_topics/mulled_containers.rst
M doc/source/dev/build_a_job_runner.rst
M doc/source/releases/13.01_announce.rst
M doc/source/releases/13.02_announce.rst
M doc/source/releases/13.04_announce.rst
M doc/source/releases/13.06_announce.rst
M doc/source/releases/13.08_announce.rst
M doc/source/releases/13.11_announce.rst
M doc/source/releases/14.02_announce.rst
M doc/source/releases/14.04_announce.rst
M doc/source/releases/14.06_announce.rst
M doc/source/releases/14.08_announce.rst
M doc/source/releases/14.10_announce.rst
M doc/source/releases/15.01_announce.rst
M doc/source/releases/15.03_announce.rst
M doc/source/releases/15.05.rst
M doc/source/releases/15.05_announce.rst
M doc/source/releases/15.07_announce.rst
M doc/source/releases/15.10_announce.rst
M doc/source/releases/16.01_announce.rst
M doc/source/releases/16.04_announce.rst
M doc/source/releases/16.07_announce.rst
M doc/source/releases/16.10_announce.rst
M doc/source/releases/17.01_announce.rst
M doc/source/slideshow/architecture/galaxy_architecture.md
M lib/galaxy/tools/xsd/README.md
M lib/galaxy/tools/xsd/galaxy.xsd
M scripts/bootstrap_history.py
M static/welcome.html.sample
M test/functional/tools/sample_datatypes_conf.xml
M test/qunit/test-data/bootstrapped.js
M test/qunit/tests/galaxy-app-base.js
Log Message:
-----------
Merge pull request #4141 from erasche/wiki-links
Swap over all URLs to new wiki location
Compare: https://github.com/galaxyproject/galaxy/compare/e43ef79576bd...c1d822d96de0