October 2017 - galaxy-commits - lists.galaxyproject.org

[galaxyproject/infrastructure-playbook] 629aee: nventory documentation improvements and fixes for ...
by GitHub 30 Oct '17

30 Oct '17

Branch: refs/heads/galaxyenv Home: https://github.com/galaxyproject/infrastructure-playbook Commit: 629aee142143ce08dbd781688d22126a4351bfaf https://github.com/galaxyproject/infrastructure-playbook/commit/629aee14214… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M env/galaxy/inventory Log Message: ----------- nventory documentation improvements and fixes for authorized keys Commit: b5b266f439840b839f1394ee497f8864c9fc4960 https://github.com/galaxyproject/infrastructure-playbook/commit/b5b266f4398… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M env/galaxy/inventory M env/galaxy/playbook.yml Log Message: ----------- Add a "fullenv" group to the Galaxy env ("liteenv" + AFS) Commit: b6c8a7134dfd9cf3ebc57ca756ef3ef24d5bd85a https://github.com/galaxyproject/infrastructure-playbook/commit/b6c8a7134df… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M env/galaxy/inventory M env/galaxy/playbook.yml A roles/kerberos_kdc/defaults/main.yml A roles/kerberos_kdc/handlers/main.yml A roles/kerberos_kdc/meta/main.yml A roles/kerberos_kdc/tasks/debian.yml A roles/kerberos_kdc/tasks/heimdal.yml A roles/kerberos_kdc/tasks/main.yml A roles/kerberos_kdc/templates/kadmind.acl.j2 A roles/kerberos_kdc/templates/kdc.conf.j2 A roles/kerberos_kdc/vars/debian.yml A roles/kerberos_kdc/vars/heimdal.yml Log Message: ----------- Add the Kerberos KDC role from the pre-vault playbook and update it. Compare: https://github.com/galaxyproject/infrastructure-playbook/compare/46d754c2b7…

1 0

[galaxyproject/galaxy] 59e5b1: Fix path to example conda mapping
by GitHub 30 Oct '17

30 Oct '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 59e5b17ac704e1c45cf693187174225d3eefe994 https://github.com/galaxyproject/galaxy/commit/59e5b17ac704e1c45cf693187174… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M config/local_conda_mapping.yml.sample Log Message: ----------- Fix path to example conda mapping Commit: aef5f4fa95c56362029dba6cf636103cf235fd13 https://github.com/galaxyproject/galaxy/commit/aef5f4fa95c56362029dba6cf636… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-10-26 (Thu, 26 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- [16.10] Fix test fixtures dependency. It should have never been in the pinned requirements and has disappeared from PyPI. Commit: 7bf2bbfa405029898a65f1ea092d8cacd2903483 https://github.com/galaxyproject/galaxy/commit/7bf2bbfa405029898a65f1ea092d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-10-27 (Fri, 27 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge pull request #4873 from jmchilton/fix_test_fixtures [16.10] Fix test fixtures dependency. Commit: 676f6a5960a185c80d7400b9cb8c92d5217bfae4 https://github.com/galaxyproject/galaxy/commit/676f6a5960a185c80d7400b9cb8c… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M client/galaxy/style/less/upload.less M static/style/blue/base.css Log Message: ----------- Fix uploadbox text content formatting. Commit: 09fdac513d59ca6dad440616a53daa97751ff905 https://github.com/galaxyproject/galaxy/commit/09fdac513d59ca6dad440616a53d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M scripts/common_startup.sh Log Message: ----------- Fix extra index URL call in common startup. - Use it for dev requirements also. - Use more correct API target that supports older versions of dependencies on PyPI. xref https://gist.github.com/jmchilton/ad8f180f5ac1eb5f689f815b04f603fa Commit: 45d4fefe63d59627063cbacaf6cdd797ee81d158 https://github.com/galaxyproject/galaxy/commit/45d4fefe63d59627063cbacaf6cd… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M scripts/common_startup.sh Log Message: ----------- Merge pull request #4898 from jmchilton/fix_extra_index [17.09] Fix extra index URL call in common startup. Commit: a537aa4ca4f7622bafe20da7339d5652e263d78f https://github.com/galaxyproject/galaxy/commit/a537aa4ca4f7622bafe20da7339d… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M config/local_conda_mapping.yml.sample Log Message: ----------- Merge pull request #4749 from mvdbeek/conda_mapping_path_fix [17.05] Fix path to example conda mapping Commit: 1664a2c7e644ee12a3bd599bfd08c5a618443ef0 https://github.com/galaxyproject/galaxy/commit/1664a2c7e644ee12a3bd599bfd08… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M client/galaxy/style/less/upload.less M static/style/blue/base.css Log Message: ----------- Merge pull request #4897 from dannon/uploadbox_wrap_fix [17.09] Fix uploadbox text content formatting. Commit: c7b09f870d31b93dab87a2eaaa95ace7f6f503b4 https://github.com/galaxyproject/galaxy/commit/c7b09f870d31b93dab87a2eaaa95… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge branch 'release_16.10' into release_17.01 Conflicts: lib/galaxy/dependencies/pinned-requirements.txt Commit: 7688b057e604f4e6e38a21fca3e47ce65c16c413 https://github.com/galaxyproject/galaxy/commit/7688b057e604f4e6e38a21fca3e4… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge branch 'release_17.01' into release_17.05 Commit: be30d6824d4975f6cb15fdd9519f4edf3e9e3079 https://github.com/galaxyproject/galaxy/commit/be30d6824d4975f6cb15fdd9519f… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M config/local_conda_mapping.yml.sample M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge branch 'release_17.05' into release_17.09 Commit: aacdf8d939e554ef9dca9fea3075813f1c0862d3 https://github.com/galaxyproject/galaxy/commit/aacdf8d939e554ef9dca9fea3075… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M client/galaxy/style/less/upload.less M config/local_conda_mapping.yml.sample M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M scripts/common_startup.sh M static/style/blue/base.css Log Message: ----------- Merge branch 'release_17.09' into dev Conflicts: static/style/blue/base.css Compare: https://github.com/galaxyproject/galaxy/compare/c2f4b5ac8f8d...aacdf8d939e5

1 0

[galaxyproject/galaxy] 59e5b1: Fix path to example conda mapping
by GitHub 30 Oct '17

30 Oct '17

Branch: refs/heads/release_17.09 Home: https://github.com/galaxyproject/galaxy Commit: 59e5b17ac704e1c45cf693187174225d3eefe994 https://github.com/galaxyproject/galaxy/commit/59e5b17ac704e1c45cf693187174… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M config/local_conda_mapping.yml.sample Log Message: ----------- Fix path to example conda mapping Commit: aef5f4fa95c56362029dba6cf636103cf235fd13 https://github.com/galaxyproject/galaxy/commit/aef5f4fa95c56362029dba6cf636… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-10-26 (Thu, 26 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- [16.10] Fix test fixtures dependency. It should have never been in the pinned requirements and has disappeared from PyPI. Commit: 7bf2bbfa405029898a65f1ea092d8cacd2903483 https://github.com/galaxyproject/galaxy/commit/7bf2bbfa405029898a65f1ea092d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-10-27 (Fri, 27 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge pull request #4873 from jmchilton/fix_test_fixtures [16.10] Fix test fixtures dependency. Commit: a537aa4ca4f7622bafe20da7339d5652e263d78f https://github.com/galaxyproject/galaxy/commit/a537aa4ca4f7622bafe20da7339d… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M config/local_conda_mapping.yml.sample Log Message: ----------- Merge pull request #4749 from mvdbeek/conda_mapping_path_fix [17.05] Fix path to example conda mapping Commit: c7b09f870d31b93dab87a2eaaa95ace7f6f503b4 https://github.com/galaxyproject/galaxy/commit/c7b09f870d31b93dab87a2eaaa95… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge branch 'release_16.10' into release_17.01 Conflicts: lib/galaxy/dependencies/pinned-requirements.txt Commit: 7688b057e604f4e6e38a21fca3e47ce65c16c413 https://github.com/galaxyproject/galaxy/commit/7688b057e604f4e6e38a21fca3e4… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge branch 'release_17.01' into release_17.05 Commit: be30d6824d4975f6cb15fdd9519f4edf3e9e3079 https://github.com/galaxyproject/galaxy/commit/be30d6824d4975f6cb15fdd9519f… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M config/local_conda_mapping.yml.sample M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge branch 'release_17.05' into release_17.09 Compare: https://github.com/galaxyproject/galaxy/compare/1664a2c7e644...be30d6824d49

1 0

[galaxyproject/galaxy] aef5f4: [16.10] Fix test fixtures dependency.
by GitHub 30 Oct '17

30 Oct '17

Branch: refs/heads/release_17.05 Home: https://github.com/galaxyproject/galaxy Commit: aef5f4fa95c56362029dba6cf636103cf235fd13 https://github.com/galaxyproject/galaxy/commit/aef5f4fa95c56362029dba6cf636… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-10-26 (Thu, 26 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- [16.10] Fix test fixtures dependency. It should have never been in the pinned requirements and has disappeared from PyPI. Commit: 7bf2bbfa405029898a65f1ea092d8cacd2903483 https://github.com/galaxyproject/galaxy/commit/7bf2bbfa405029898a65f1ea092d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-10-27 (Fri, 27 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge pull request #4873 from jmchilton/fix_test_fixtures [16.10] Fix test fixtures dependency. Commit: c7b09f870d31b93dab87a2eaaa95ace7f6f503b4 https://github.com/galaxyproject/galaxy/commit/c7b09f870d31b93dab87a2eaaa95… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge branch 'release_16.10' into release_17.01 Conflicts: lib/galaxy/dependencies/pinned-requirements.txt Commit: 7688b057e604f4e6e38a21fca3e47ce65c16c413 https://github.com/galaxyproject/galaxy/commit/7688b057e604f4e6e38a21fca3e4… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge branch 'release_17.01' into release_17.05 Compare: https://github.com/galaxyproject/galaxy/compare/a537aa4ca4f7...7688b057e604

1 0

[galaxyproject/galaxy] aef5f4: [16.10] Fix test fixtures dependency.
by GitHub 30 Oct '17

30 Oct '17

Branch: refs/heads/release_17.01 Home: https://github.com/galaxyproject/galaxy Commit: aef5f4fa95c56362029dba6cf636103cf235fd13 https://github.com/galaxyproject/galaxy/commit/aef5f4fa95c56362029dba6cf636… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-10-26 (Thu, 26 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- [16.10] Fix test fixtures dependency. It should have never been in the pinned requirements and has disappeared from PyPI. Commit: 7bf2bbfa405029898a65f1ea092d8cacd2903483 https://github.com/galaxyproject/galaxy/commit/7bf2bbfa405029898a65f1ea092d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-10-27 (Fri, 27 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge pull request #4873 from jmchilton/fix_test_fixtures [16.10] Fix test fixtures dependency. Commit: c7b09f870d31b93dab87a2eaaa95ace7f6f503b4 https://github.com/galaxyproject/galaxy/commit/c7b09f870d31b93dab87a2eaaa95… Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge branch 'release_16.10' into release_17.01 Conflicts: lib/galaxy/dependencies/pinned-requirements.txt Compare: https://github.com/galaxyproject/galaxy/compare/a7bf1601a1ad...c7b09f870d31

1 0

[galaxyproject/galaxy] 676f6a: Fix uploadbox text content formatting.
by GitHub 30 Oct '17

30 Oct '17

Branch: refs/heads/release_17.09 Home: https://github.com/galaxyproject/galaxy Commit: 676f6a5960a185c80d7400b9cb8c92d5217bfae4 https://github.com/galaxyproject/galaxy/commit/676f6a5960a185c80d7400b9cb8c… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M client/galaxy/style/less/upload.less M static/style/blue/base.css Log Message: ----------- Fix uploadbox text content formatting. Commit: 1664a2c7e644ee12a3bd599bfd08c5a618443ef0 https://github.com/galaxyproject/galaxy/commit/1664a2c7e644ee12a3bd599bfd08… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M client/galaxy/style/less/upload.less M static/style/blue/base.css Log Message: ----------- Merge pull request #4897 from dannon/uploadbox_wrap_fix [17.09] Fix uploadbox text content formatting. Compare: https://github.com/galaxyproject/galaxy/compare/45d4fefe63d5...1664a2c7e644

1 0

[galaxyproject/galaxy] 59e5b1: Fix path to example conda mapping
by GitHub 30 Oct '17

30 Oct '17

Branch: refs/heads/release_17.05 Home: https://github.com/galaxyproject/galaxy Commit: 59e5b17ac704e1c45cf693187174225d3eefe994 https://github.com/galaxyproject/galaxy/commit/59e5b17ac704e1c45cf693187174… Author: mvdbeek <m.vandenbeek(a)gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M config/local_conda_mapping.yml.sample Log Message: ----------- Fix path to example conda mapping Commit: a537aa4ca4f7622bafe20da7339d5652e263d78f https://github.com/galaxyproject/galaxy/commit/a537aa4ca4f7622bafe20da7339d… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M config/local_conda_mapping.yml.sample Log Message: ----------- Merge pull request #4749 from mvdbeek/conda_mapping_path_fix [17.05] Fix path to example conda mapping Compare: https://github.com/galaxyproject/galaxy/compare/20621b7d0944...a537aa4ca4f7

1 0

[galaxyproject/galaxy] 09fdac: Fix extra index URL call in common startup.
by GitHub 30 Oct '17

30 Oct '17

Branch: refs/heads/release_17.09 Home: https://github.com/galaxyproject/galaxy Commit: 09fdac513d59ca6dad440616a53daa97751ff905 https://github.com/galaxyproject/galaxy/commit/09fdac513d59ca6dad440616a53d… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M scripts/common_startup.sh Log Message: ----------- Fix extra index URL call in common startup. - Use it for dev requirements also. - Use more correct API target that supports older versions of dependencies on PyPI. xref https://gist.github.com/jmchilton/ad8f180f5ac1eb5f689f815b04f603fa Commit: 45d4fefe63d59627063cbacaf6cdd797ee81d158 https://github.com/galaxyproject/galaxy/commit/45d4fefe63d59627063cbacaf6cd… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M scripts/common_startup.sh Log Message: ----------- Merge pull request #4898 from jmchilton/fix_extra_index [17.09] Fix extra index URL call in common startup. Compare: https://github.com/galaxyproject/galaxy/compare/b9adcc81e866...45d4fefe63d5

1 0

[galaxyproject/galaxy] e57f3c: Fix a typo.
by GitHub 30 Oct '17

30 Oct '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e57f3cfe328e28f8758d9c047a2911b03f5603f9 https://github.com/galaxyproject/galaxy/commit/e57f3cfe328e28f8758d9c047a29… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Fix a typo. Commit: 144928fbebabc3cf1938d2b415a8132c2b08f474 https://github.com/galaxyproject/galaxy/commit/144928fbebabc3cf1938d2b415a8… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M client/galaxy/style/less/ui.less M static/style/blue/base.css Log Message: ----------- Fix admin side panel not being full container height Commit: c2f4b5ac8f8d7743a87fe9175dafa380b6028d18 https://github.com/galaxyproject/galaxy/commit/c2f4b5ac8f8d7743a87fe9175daf… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/style/less/ui.less M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/style/blue/base.css Log Message: ----------- Merge pull request #4895 from dannon/minor_admin_panel_fixes Minor admin panel fixes Compare: https://github.com/galaxyproject/galaxy/compare/26a9f8916d64...c2f4b5ac8f8d

1 0

[galaxyproject/galaxy] aa66d7: Remove unnecessary tool dependency installation st...
by GitHub 30 Oct '17

30 Oct '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: aa66d7fdfd363bd34112d5d15d783f7921e487df https://github.com/galaxyproject/galaxy/commit/aa66d7fdfd363bd34112d5d15d78… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-17 (Tue, 17 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py R templates/admin/tool_shed_repository/tool_dependencies_grid.mako Log Message: ----------- Remove unnecessary tool dependency installation status grid Commit: d616878f85f2b0bb3cbc8fb2cd5ac7f18a114e5c https://github.com/galaxyproject/galaxy/commit/d616878f85f2b0bb3cbc8fb2cd5a… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-17 (Tue, 17 Oct 2017) Changed paths: M client/galaxy/scripts/admin.toolshed.js M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/login.js M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/apps/panels/history-panel.js M client/galaxy/scripts/apps/panels/tool-panel.js M client/galaxy/scripts/galaxy.interactive_environments.js M client/galaxy/scripts/galaxy.js M client/galaxy/scripts/galaxy.library.js M client/galaxy/scripts/galaxy.pages.js M client/galaxy/scripts/i18n.js M client/galaxy/scripts/layout/generic-nav-view.js M client/galaxy/scripts/layout/masthead.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/modal.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/layout/panel.js M client/galaxy/scripts/layout/router.js M client/galaxy/scripts/layout/scratchbook.js M client/galaxy/scripts/mvc/annotation.js M client/galaxy/scripts/mvc/base-mvc.js M client/galaxy/scripts/mvc/base/controlled-fetch-collection.js M client/galaxy/scripts/mvc/citation/citation-model.js M client/galaxy/scripts/mvc/citation/citation-view.js M client/galaxy/scripts/mvc/collection/base-creator.js M client/galaxy/scripts/mvc/collection/collection-li-edit.js M client/galaxy/scripts/mvc/collection/collection-li.js M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/collection/collection-view.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/dataset/data.js M client/galaxy/scripts/mvc/dataset/dataset-choice.js M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M client/galaxy/scripts/mvc/dataset/dataset-error.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/dataset/dataset-list.js M client/galaxy/scripts/mvc/dataset/dataset-model.js M client/galaxy/scripts/mvc/dataset/states.js M client/galaxy/scripts/mvc/form/form-data.js M client/galaxy/scripts/mvc/form/form-input.js M client/galaxy/scripts/mvc/form/form-parameters.js M client/galaxy/scripts/mvc/form/form-repeat.js M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/form/form-wrapper.js M client/galaxy/scripts/mvc/grid/grid-model.js M client/galaxy/scripts/mvc/grid/grid-shared.js M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/history/copy-dialog.js M client/galaxy/scripts/mvc/history/hda-li-edit.js M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/scripts/mvc/history/hda-model.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/scripts/mvc/history/hdca-li.js M client/galaxy/scripts/mvc/history/hdca-model.js M client/galaxy/scripts/mvc/history/history-content-model.js M client/galaxy/scripts/mvc/history/history-contents.js M client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/history/history-model.js M client/galaxy/scripts/mvc/history/history-preferences.js M client/galaxy/scripts/mvc/history/history-structure-view.js M client/galaxy/scripts/mvc/history/history-view-annotated.js M client/galaxy/scripts/mvc/history/history-view-edit-current.js M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/history/history-view.js M client/galaxy/scripts/mvc/history/job-dag.js M client/galaxy/scripts/mvc/history/multi-panel.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/job/job-li.js M client/galaxy/scripts/mvc/job/job-model.js M client/galaxy/scripts/mvc/job/job-params.js M client/galaxy/scripts/mvc/lazy/lazy-limited.js M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-folder-view.js M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-folderrow-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-library-view.js M client/galaxy/scripts/mvc/library/library-librarylist-view.js M client/galaxy/scripts/mvc/library/library-libraryrow-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js M client/galaxy/scripts/mvc/library/library-model.js M client/galaxy/scripts/mvc/list/list-item.js M client/galaxy/scripts/mvc/list/list-view.js M client/galaxy/scripts/mvc/tag.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/tool/tool-genomespace.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/scripts/mvc/toolshed/categories-view.js M client/galaxy/scripts/mvc/toolshed/repo-queue-view.js M client/galaxy/scripts/mvc/toolshed/repo-status-view.js M client/galaxy/scripts/mvc/toolshed/repositories-view.js M client/galaxy/scripts/mvc/toolshed/repository-queue-view.js M client/galaxy/scripts/mvc/toolshed/repository-view.js M client/galaxy/scripts/mvc/toolshed/shed-list-view.js M client/galaxy/scripts/mvc/toolshed/toolshed-model.js M client/galaxy/scripts/mvc/toolshed/util.js M client/galaxy/scripts/mvc/toolshed/workflows-view.js M client/galaxy/scripts/mvc/tours.js M client/galaxy/scripts/mvc/ui/error-modal.js M client/galaxy/scripts/mvc/ui/icon-button.js M client/galaxy/scripts/mvc/ui/popup-menu.js M client/galaxy/scripts/mvc/ui/ui-buttons.js M client/galaxy/scripts/mvc/ui/ui-color-picker.js M client/galaxy/scripts/mvc/ui/ui-drilldown.js M client/galaxy/scripts/mvc/ui/ui-frames.js M client/galaxy/scripts/mvc/ui/ui-list.js M client/galaxy/scripts/mvc/ui/ui-misc.js M client/galaxy/scripts/mvc/ui/ui-modal.js M client/galaxy/scripts/mvc/ui/ui-options.js M client/galaxy/scripts/mvc/ui/ui-popover.js M client/galaxy/scripts/mvc/ui/ui-portlet.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/ui/ui-select-ftp.js M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js M client/galaxy/scripts/mvc/ui/ui-select-library.js M client/galaxy/scripts/mvc/ui/ui-select.js M client/galaxy/scripts/mvc/ui/ui-slider.js M client/galaxy/scripts/mvc/ui/ui-table.js M client/galaxy/scripts/mvc/ui/ui-tabs.js M client/galaxy/scripts/mvc/ui/ui-thumbnails.js M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/scripts/mvc/upload/upload-button.js M client/galaxy/scripts/mvc/upload/upload-extension.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/mvc/upload/upload-model.js M client/galaxy/scripts/mvc/upload/upload-settings.js M client/galaxy/scripts/mvc/upload/upload-view.js M client/galaxy/scripts/mvc/user/user-custom-builds.js M client/galaxy/scripts/mvc/user/user-model.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/user/user-quotameter.js M client/galaxy/scripts/mvc/visualization/visualization-model.js M client/galaxy/scripts/mvc/webhooks.js M client/galaxy/scripts/mvc/workflow/workflow-canvas.js M client/galaxy/scripts/mvc/workflow/workflow-connector.js M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-icons.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-model.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M client/galaxy/scripts/mvc/workflow/workflow-view-data.js M client/galaxy/scripts/mvc/workflow/workflow-view-node.js M client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/nls/de/locale.js M client/galaxy/scripts/nls/es/locale.js M client/galaxy/scripts/nls/fr/locale.js M client/galaxy/scripts/nls/ja/locale.js M client/galaxy/scripts/nls/locale.js M client/galaxy/scripts/nls/zh/locale.js M client/galaxy/scripts/onload.js M client/galaxy/scripts/polyfills.js M client/galaxy/scripts/reports_webapp/run_stats.js M client/galaxy/scripts/ui/autocom_tagging.js M client/galaxy/scripts/ui/editable-text.js M client/galaxy/scripts/ui/fa-icon-button.js M client/galaxy/scripts/ui/filter-control.js M client/galaxy/scripts/ui/hoverhighlight.js M client/galaxy/scripts/ui/loading-indicator.js M client/galaxy/scripts/ui/mode-button.js M client/galaxy/scripts/ui/pagination.js M client/galaxy/scripts/ui/peek-column-selector.js M client/galaxy/scripts/ui/popupmenu.js M client/galaxy/scripts/ui/scroll-panel.js M client/galaxy/scripts/ui/search-input.js M client/galaxy/scripts/utils/add-logging.js M client/galaxy/scripts/utils/ajax-queue.js M client/galaxy/scripts/utils/async-save-text.js M client/galaxy/scripts/utils/config.js M client/galaxy/scripts/utils/deferred.js M client/galaxy/scripts/utils/graph.js M client/galaxy/scripts/utils/levenshtein.js M client/galaxy/scripts/utils/localization.js M client/galaxy/scripts/utils/metrics-logger.js M client/galaxy/scripts/utils/natural-sort.js M client/galaxy/scripts/utils/query-string-parsing.js M client/galaxy/scripts/utils/uploadbox.js M client/galaxy/scripts/utils/utils.js M client/galaxy/scripts/viz/bbi-data-manager.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/phyloviz.js M client/galaxy/scripts/viz/sweepster.js M client/galaxy/scripts/viz/trackster.js M client/galaxy/scripts/viz/trackster/filters.js M client/galaxy/scripts/viz/trackster/painters.js M client/galaxy/scripts/viz/trackster/slotting.js M client/galaxy/scripts/viz/trackster/tracks.js M client/galaxy/scripts/viz/trackster/util.js M client/galaxy/scripts/viz/visualization.js M client/galaxy/scripts/viz/viz_views.js M client/package.json M client/yarn.lock M static/maps/admin.toolshed.js.map M static/maps/galaxy.interactive_environments.js.map M static/maps/galaxy.js.map M static/maps/galaxy.library.js.map M static/maps/galaxy.pages.js.map M static/maps/i18n.js.map M static/maps/layout/generic-nav-view.js.map M static/maps/layout/masthead.js.map M static/maps/layout/menu.js.map M static/maps/layout/modal.js.map M static/maps/layout/page.js.map M static/maps/layout/panel.js.map M static/maps/layout/router.js.map M static/maps/layout/scratchbook.js.map M static/maps/mvc/annotation.js.map M static/maps/mvc/base-mvc.js.map M static/maps/mvc/base/controlled-fetch-collection.js.map M static/maps/mvc/citation/citation-model.js.map M static/maps/mvc/citation/citation-view.js.map M static/maps/mvc/collection/base-creator.js.map M static/maps/mvc/collection/collection-li-edit.js.map M static/maps/mvc/collection/collection-li.js.map M static/maps/mvc/collection/collection-model.js.map M static/maps/mvc/collection/collection-view-edit.js.map M static/maps/mvc/collection/collection-view.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/dataset/data.js.map M static/maps/mvc/dataset/dataset-choice.js.map M static/maps/mvc/dataset/dataset-edit-attributes.js.map M static/maps/mvc/dataset/dataset-error.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/dataset/dataset-li.js.map M static/maps/mvc/dataset/dataset-list.js.map M static/maps/mvc/dataset/dataset-model.js.map M static/maps/mvc/dataset/states.js.map M static/maps/mvc/form/form-data.js.map M static/maps/mvc/form/form-input.js.map M static/maps/mvc/form/form-parameters.js.map M static/maps/mvc/form/form-repeat.js.map M static/maps/mvc/form/form-section.js.map M static/maps/mvc/form/form-view.js.map M static/maps/mvc/form/form-wrapper.js.map M static/maps/mvc/grid/grid-model.js.map M static/maps/mvc/grid/grid-shared.js.map M static/maps/mvc/grid/grid-template.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/mvc/history/copy-dialog.js.map M static/maps/mvc/history/hda-li-edit.js.map M static/maps/mvc/history/hda-li.js.map M static/maps/mvc/history/hda-model.js.map M static/maps/mvc/history/hdca-li-edit.js.map M static/maps/mvc/history/hdca-li.js.map M static/maps/mvc/history/hdca-model.js.map M static/maps/mvc/history/history-content-model.js.map M static/maps/mvc/history/history-contents.js.map M static/maps/mvc/history/history-list.js.map M static/maps/mvc/history/history-model.js.map M static/maps/mvc/history/history-preferences.js.map M static/maps/mvc/history/history-structure-view.js.map M static/maps/mvc/history/history-view-annotated.js.map M static/maps/mvc/history/history-view-edit-current.js.map M static/maps/mvc/history/history-view-edit.js.map M static/maps/mvc/history/history-view.js.map M static/maps/mvc/history/job-dag.js.map M static/maps/mvc/history/multi-panel.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/job/job-li.js.map M static/maps/mvc/job/job-model.js.map M static/maps/mvc/job/job-params.js.map M static/maps/mvc/lazy/lazy-limited.js.map M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-folder-view.js.map M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-folderrow-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/library/library-library-view.js.map M static/maps/mvc/library/library-librarylist-view.js.map M static/maps/mvc/library/library-libraryrow-view.js.map M static/maps/mvc/library/library-librarytoolbar-view.js.map M static/maps/mvc/library/library-model.js.map M static/maps/mvc/list/list-item.js.map M static/maps/mvc/list/list-view.js.map M static/maps/mvc/tag.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/maps/mvc/tool/tool-form.js.map M static/maps/mvc/tool/tool-genomespace.js.map M static/maps/mvc/tool/tools.js.map M static/maps/mvc/toolshed/categories-view.js.map M static/maps/mvc/toolshed/repo-queue-view.js.map M static/maps/mvc/toolshed/repo-status-view.js.map M static/maps/mvc/toolshed/repositories-view.js.map M static/maps/mvc/toolshed/repository-queue-view.js.map M static/maps/mvc/toolshed/repository-view.js.map M static/maps/mvc/toolshed/shed-list-view.js.map M static/maps/mvc/toolshed/toolshed-model.js.map M static/maps/mvc/toolshed/util.js.map M static/maps/mvc/toolshed/workflows-view.js.map M static/maps/mvc/tours.js.map M static/maps/mvc/ui/error-modal.js.map M static/maps/mvc/ui/icon-button.js.map M static/maps/mvc/ui/popup-menu.js.map M static/maps/mvc/ui/ui-buttons.js.map M static/maps/mvc/ui/ui-color-picker.js.map M static/maps/mvc/ui/ui-drilldown.js.map M static/maps/mvc/ui/ui-frames.js.map M static/maps/mvc/ui/ui-list.js.map M static/maps/mvc/ui/ui-misc.js.map M static/maps/mvc/ui/ui-modal.js.map M static/maps/mvc/ui/ui-options.js.map M static/maps/mvc/ui/ui-popover.js.map M static/maps/mvc/ui/ui-portlet.js.map M static/maps/mvc/ui/ui-select-content.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/maps/mvc/ui/ui-select-ftp.js.map M static/maps/mvc/ui/ui-select-genomespace.js.map M static/maps/mvc/ui/ui-select-library.js.map M static/maps/mvc/ui/ui-select.js.map M static/maps/mvc/ui/ui-slider.js.map M static/maps/mvc/ui/ui-table.js.map M static/maps/mvc/ui/ui-tabs.js.map M static/maps/mvc/ui/ui-thumbnails.js.map M static/maps/mvc/upload/collection/collection-row.js.map M static/maps/mvc/upload/collection/collection-view.js.map M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/composite/composite-view.js.map M static/maps/mvc/upload/default/default-row.js.map M static/maps/mvc/upload/default/default-view.js.map M static/maps/mvc/upload/upload-button.js.map M static/maps/mvc/upload/upload-extension.js.map M static/maps/mvc/upload/upload-ftp.js.map M static/maps/mvc/upload/upload-model.js.map M static/maps/mvc/upload/upload-settings.js.map M static/maps/mvc/upload/upload-view.js.map M static/maps/mvc/user/user-custom-builds.js.map M static/maps/mvc/user/user-model.js.map M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/user/user-quotameter.js.map M static/maps/mvc/visualization/visualization-model.js.map M static/maps/mvc/webhooks.js.map M static/maps/mvc/workflow/workflow-canvas.js.map M static/maps/mvc/workflow/workflow-connector.js.map M static/maps/mvc/workflow/workflow-forms.js.map M static/maps/mvc/workflow/workflow-icons.js.map M static/maps/mvc/workflow/workflow-manager.js.map M static/maps/mvc/workflow/workflow-model.js.map M static/maps/mvc/workflow/workflow-node.js.map M static/maps/mvc/workflow/workflow-terminals.js.map M static/maps/mvc/workflow/workflow-view-data.js.map M static/maps/mvc/workflow/workflow-view-node.js.map M static/maps/mvc/workflow/workflow-view-terminals.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/maps/mvc/workflow/workflow.js.map M static/maps/nls/de/locale.js.map M static/maps/nls/es/locale.js.map M static/maps/nls/fr/locale.js.map M static/maps/nls/ja/locale.js.map M static/maps/nls/locale.js.map M static/maps/nls/zh/locale.js.map M static/maps/onload.js.map M static/maps/polyfills.js.map M static/maps/reports_webapp/run_stats.js.map M static/maps/ui/autocom_tagging.js.map M static/maps/ui/editable-text.js.map M static/maps/ui/fa-icon-button.js.map M static/maps/ui/filter-control.js.map M static/maps/ui/hoverhighlight.js.map M static/maps/ui/loading-indicator.js.map M static/maps/ui/mode-button.js.map M static/maps/ui/pagination.js.map M static/maps/ui/peek-column-selector.js.map M static/maps/ui/popupmenu.js.map M static/maps/ui/scroll-panel.js.map M static/maps/ui/search-input.js.map M static/maps/utils/add-logging.js.map M static/maps/utils/ajax-queue.js.map M static/maps/utils/async-save-text.js.map M static/maps/utils/config.js.map M static/maps/utils/deferred.js.map M static/maps/utils/graph.js.map M static/maps/utils/levenshtein.js.map M static/maps/utils/localization.js.map M static/maps/utils/metrics-logger.js.map M static/maps/utils/natural-sort.js.map M static/maps/utils/query-string-parsing.js.map M static/maps/utils/uploadbox.js.map M static/maps/utils/utils.js.map M static/maps/viz/bbi-data-manager.js.map M static/maps/viz/circster.js.map M static/maps/viz/phyloviz.js.map M static/maps/viz/sweepster.js.map M static/maps/viz/trackster.js.map M static/maps/viz/trackster/filters.js.map M static/maps/viz/trackster/painters.js.map M static/maps/viz/trackster/slotting.js.map M static/maps/viz/trackster/tracks.js.map M static/maps/viz/trackster/util.js.map M static/maps/viz/visualization.js.map M static/maps/viz/viz_views.js.map M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map M test/functional/tools/collection_split_on_column.xml Log Message: ----------- Merge branch 'remove_toolshed_grids' into remove_toolshed_dependency_grid Commit: c9d87cc2e524307953e0d200854a1b35abe6fe73 https://github.com/galaxyproject/galaxy/commit/c9d87cc2e524307953e0d200854a… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-18 (Wed, 18 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M static/maps/layout/page.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/form/form-parameters.js.map M static/maps/mvc/grid/grid-view.js.map M static/scripts/layout/page.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/form/form-parameters.js M static/scripts/mvc/grid/grid-view.js Log Message: ----------- Remove unused variables and imports Commit: f0484351dcb7e1256bcf476b656f38f7eb3460bd https://github.com/galaxyproject/galaxy/commit/f0484351dcb7e1256bcf476b656f… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-18 (Wed, 18 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/form/form-parameters.js M config/datatypes_conf.xml.sample M config/plugins/webhooks/demo/tour_generator/static/script.js M doc/source/slideshow/architecture/galaxy_architecture.md A lib/galaxy/datatypes/annotation.py M lib/galaxy/datatypes/converters/sam_to_bam.py M lib/galaxy/jobs/handler.py M lib/galaxy_ext/metadata/set_metadata.py M static/maps/layout/page.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/form/form-parameters.js.map 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.map M static/scripts/layout/page.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/form/form-parameters.js M static/scripts/mvc/grid/grid-view.js Log Message: ----------- Merge branch 'dev' into remove_toolshed_dependency_grid Commit: fd098c97043b672bdaeaa2ee3abc352b6d06d343 https://github.com/galaxyproject/galaxy/commit/fd098c97043b672bdaeaa2ee3abc… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py Log Message: ----------- Remove installation grid from admin toolshed grids Commit: 3c22c31bd77f239a1887ccf3aa13f257f0f8ac17 https://github.com/galaxyproject/galaxy/commit/3c22c31bd77f239a1887ccf3aa13… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- Remove installation grid reference from admin toolshed controller Commit: 5b0635b833a9efa4be38bcdfeb8ad22ff5f27786 https://github.com/galaxyproject/galaxy/commit/5b0635b833a9efa4be38bcdfeb8a… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- Remove uninstall handling from manage repositories endpoint Commit: fe1cbca9aaad0079348a73ef9632c51dde93e5ca https://github.com/galaxyproject/galaxy/commit/fe1cbca9aaad0079348a73ef9632… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- Rename to install repositories, remove operation switch Commit: 0c5c8a95abca26d3c447a3a2b6d9903d2eedbd8d https://github.com/galaxyproject/galaxy/commit/0c5c8a95abca26d3c447a3a2b6d9… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/toolshed/repository-queue-view.js M client/galaxy/scripts/mvc/toolshed/repository-view.js M static/maps/mvc/toolshed/repository-queue-view.js.map M static/maps/mvc/toolshed/repository-view.js.map M static/scripts/mvc/toolshed/repository-queue-view.js M static/scripts/mvc/toolshed/repository-view.js Log Message: ----------- Redirect client request urls Commit: 5207476dce338ba5860d7bdfb0e6a3f1cddea4c9 https://github.com/galaxyproject/galaxy/commit/5207476dce338ba5860d7bdfb0e6… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M templates/admin/tool_shed_repository/initiate_repository_installation.mako Log Message: ----------- Request url in mako file Commit: 41eaf0a7820235bd1fb12e7920597c40e059b0ca https://github.com/galaxyproject/galaxy/commit/41eaf0a7820235bd1fb12e792059… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M templates/admin/tool_shed_repository/initiate_repository_installation.mako Log Message: ----------- Remove unnecessary operation specifier from request Commit: 9052c592758e50cdba427cfd96e4fdd03d3c7ccf https://github.com/galaxyproject/galaxy/commit/9052c592758e50cdba427cfd96e4… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M templates/admin/tool_shed_repository/initiate_repository_installation.mako Log Message: ----------- Remove unused api flag from repository installation controller Commit: 21f21113eb7667a03870528e5c07a37ce029e9a4 https://github.com/galaxyproject/galaxy/commit/21f21113eb7667a03870528e5c07… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py R templates/admin/tool_shed_repository/repository_installation_grid.mako Log Message: ----------- Fix Commit: b218aae1de1bf35606e964e6fb6ecd94b9054910 https://github.com/galaxyproject/galaxy/commit/b218aae1de1bf35606e964e6fb6e… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M templates/admin/tool_shed_repository/initiate_repository_installation.mako Log Message: ----------- Use installation monitoring view instead of installation monitoring grid Commit: 77f6b7bacbdf752c993e7a1a02a830c3418fb149 https://github.com/galaxyproject/galaxy/commit/77f6b7bacbdf752c993e7a1a02a8… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py R templates/admin/tool_shed_repository/initiate_repository_installation.mako A templates/admin/tool_shed_repository/monitor_repository_installation.mako Log Message: ----------- Rename mako to emphasize new role, add message handler Commit: f0b5caff5fed1e125e80e07b7f2b43bc4d98f5e7 https://github.com/galaxyproject/galaxy/commit/f0b5caff5fed1e125e80e07b7f2b… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M templates/admin/tool_shed_repository/monitor_repository_installation.mako Log Message: ----------- Fix variable testing Commit: 50ecbea171f19587516a6d91da97250b9280c3da https://github.com/galaxyproject/galaxy/commit/50ecbea171f19587516a6d91da97… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- Escape message Commit: b76e0559dd3b3ba464b40acec10088f8d68da568 https://github.com/galaxyproject/galaxy/commit/b76e0559dd3b3ba464b40acec100… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py Log Message: ----------- Fix lint Commit: f622a4367981e9b4a60343e77984bfc6f3147baf https://github.com/galaxyproject/galaxy/commit/f622a4367981e9b4a60343e77984… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M test/shed_functional/base/twilltestcase.py Log Message: ----------- Revise install repositories route Commit: 435044b48b5b02c66df14637dc36bb3545e642df https://github.com/galaxyproject/galaxy/commit/435044b48b5b02c66df14637dc36… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py Log Message: ----------- Add message, fix escaping Commit: 401870453059aef380952fa2c816fdcda701ebcf https://github.com/galaxyproject/galaxy/commit/401870453059aef380952fa2c816… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M templates/admin/tool_shed_repository/monitor_repository_installation.mako Log Message: ----------- Fix update query, add message Commit: 9ba393400100c2ed6b913c75840439b396817c0c https://github.com/galaxyproject/galaxy/commit/9ba393400100c2ed6b913c758404… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-19 (Thu, 19 Oct 2017) Changed paths: M templates/admin/tool_shed_repository/monitor_repository_installation.mako Log Message: ----------- Fix typo in message Commit: 620ef86509932d619c126a754d8758047efcadaa https://github.com/galaxyproject/galaxy/commit/620ef86509932d619c126a754d87… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-10-25 (Wed, 25 Oct 2017) Changed paths: M .ci/flake8_lint_include_list.txt M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/galaxy.interactive_environments.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-folderrow-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-libraryrow-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js M client/galaxy/scripts/utils/utils.js M client/galaxy/style/less/library.less M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M config/plugins/interactive_environments/jupyter/static/js/jupyter.js M config/plugins/webhooks/demo/tour_generator/helper/__init__.py M cron/add_manual_builds.py M cron/build_chrom_db.py M cron/parse_builds.py M cron/parse_builds_3_sites.py A doc/source/releases/17.09.rst M doc/source/releases/17.09_announce.rst A doc/source/releases/18.01_announce.rst M doc/source/releases/index.rst M lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/config.py M lib/galaxy/containers/docker_model.py M lib/galaxy/datatypes/annotation.py M lib/galaxy/datatypes/assembly.py M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/constructive_solid_geometry.py M lib/galaxy/datatypes/converters/bed_to_gff_converter.py M lib/galaxy/datatypes/converters/fastqsolexa_to_qual_converter.py M lib/galaxy/datatypes/converters/gff_to_bed_converter.py M lib/galaxy/datatypes/converters/interval_to_bed_converter.py M lib/galaxy/datatypes/converters/interval_to_bedstrict_converter.py M lib/galaxy/datatypes/converters/interval_to_coverage.py M lib/galaxy/datatypes/converters/interval_to_fli.py M lib/galaxy/datatypes/converters/lped_to_fped_converter.py M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py M lib/galaxy/datatypes/converters/pbed_ldreduced_converter.py M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/dataproviders/external.py M lib/galaxy/datatypes/display_applications/application.py M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/images.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/msa.py M lib/galaxy/datatypes/ngsindex.py M lib/galaxy/datatypes/plant_tribes.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/qualityscore.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/text.py M lib/galaxy/datatypes/tracks.py M lib/galaxy/datatypes/util/generic_util.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/deferred/__init__.py M lib/galaxy/jobs/handler.py M lib/galaxy/jobs/output_checker.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/cli.py M lib/galaxy/jobs/runners/condor.py M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/godocker.py M lib/galaxy/jobs/runners/kubernetes.py M lib/galaxy/jobs/runners/local.py M lib/galaxy/jobs/runners/pbs.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/jobs/runners/state_handler_factory.py M lib/galaxy/jobs/runners/tasks.py M lib/galaxy/jobs/runners/util/cli/job/slurm.py M lib/galaxy/jobs/runners/util/cli/job/torque.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/managers/context.py M lib/galaxy/managers/folders.py M lib/galaxy/managers/libraries.py M lib/galaxy/managers/library_datasets.py M lib/galaxy/managers/users.py M lib/galaxy/model/__init__.py M lib/galaxy/model/custom_types.py M lib/galaxy/model/mapping.py M lib/galaxy/model/metadata.py M lib/galaxy/model/migrate/check.py M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py M lib/galaxy/model/migrate/versions/0024_page_slug_unique_constraint.py M lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.py M lib/galaxy/model/migrate/versions/0033_published_cols_for_histories_and_workflows.py M lib/galaxy/model/migrate/versions/0041_workflow_invocation.py M lib/galaxy/model/migrate/versions/0042_workflow_invocation_fix.py M lib/galaxy/model/migrate/versions/0056_workflow_outputs.py M lib/galaxy/model/migrate/versions/0061_tasks.py M lib/galaxy/model/migrate/versions/0076_fix_form_values_data_corruption.py M lib/galaxy/model/migrate/versions/0115_longer_user_password_field.py M lib/galaxy/model/tool_shed_install/migrate/check.py M lib/galaxy/sample_tracking/external_service_types.py M lib/galaxy/sample_tracking/request_types.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/actions/metadata.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/dynamic_options.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parameters/validation.py M lib/galaxy/tools/parser/output_actions.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/util/maf_utilities.py M lib/galaxy/tools/wrappers.py M lib/galaxy/util/__init__.py M lib/galaxy/util/checkers.py M lib/galaxy/util/dictifiable.py M lib/galaxy/util/hash_util.py M lib/galaxy/util/heartbeat.py M lib/galaxy/util/image_util.py M lib/galaxy/util/object_wrapper.py A lib/galaxy/util/path/__init__.py A lib/galaxy/util/path/ntpath.py A lib/galaxy/util/path/posixpath.py M lib/galaxy/util/sanitize_html.py M lib/galaxy/visualization/data_providers/basic.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/visualization/genomes.py M lib/galaxy/visualization/plugins/interactive_environments.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/framework/decorators.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/framework/middleware/error.py M lib/galaxy/web/framework/middleware/sentry.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/stack/__init__.py M lib/galaxy/webapps/galaxy/api/authenticate.py M lib/galaxy/webapps/galaxy/api/folder_contents.py M lib/galaxy/webapps/galaxy/api/forms.py M lib/galaxy/webapps/galaxy/api/group_roles.py M lib/galaxy/webapps/galaxy/api/group_users.py M lib/galaxy/webapps/galaxy/api/groups.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/api/library_contents.py M lib/galaxy/webapps/galaxy/api/library_datasets.py M lib/galaxy/webapps/galaxy/api/remote_files.py M lib/galaxy/webapps/galaxy/api/request_types.py M lib/galaxy/webapps/galaxy/api/requests.py M lib/galaxy/webapps/galaxy/api/roles.py M lib/galaxy/webapps/galaxy/api/samples.py M lib/galaxy/webapps/galaxy/api/tool_data.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py R lib/galaxy/webapps/galaxy/controllers/external_service.py R lib/galaxy/webapps/galaxy/controllers/external_services.py M lib/galaxy/webapps/galaxy/controllers/library.py M lib/galaxy/webapps/galaxy/controllers/library_common.py R lib/galaxy/webapps/galaxy/controllers/request_type.py R lib/galaxy/webapps/galaxy/controllers/requests.py R lib/galaxy/webapps/galaxy/controllers/requests_admin.py R lib/galaxy/webapps/galaxy/controllers/requests_common.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/tool_runner.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/reports/controllers/system.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/model/migrate/check.py M lib/galaxy_ext/metadata/set_metadata.py M lib/psyco_full.py M lib/tool_shed/galaxy_install/metadata/installed_repository_metadata_manager.py M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M lib/tool_shed/grids/util.py M lib/tool_shed/managers/groups.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/metadata/repository_metadata_manager.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/util/admin_util.py M lib/tool_shed/util/basic_util.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/util/tool_util.py M lib/tool_shed/util/workflow_util.py M scripts/bootstrap_history.py M scripts/build_toolbox.py M scripts/check_galaxy.py M scripts/cleanup_datasets/cleanup_datasets.py M scripts/cleanup_datasets/pgcleanup.py M scripts/drmaa_external_runner.py M scripts/helper.py M scripts/loc_files/create_all_fasta_loc.py M scripts/microbes/BeautifulSoup.py M scripts/microbes/create_bacteria_loc_file.py M scripts/microbes/create_bacteria_table.py M scripts/microbes/create_nib_seq_loc_file.py M scripts/microbes/get_builds_lengths.py M scripts/microbes/harvest_bacteria.py M scripts/microbes/ncbi_to_ucsc.py M scripts/microbes/util.py M scripts/others/incorrect_gops_jobs.py M scripts/others/incorrect_gops_join_jobs.py M scripts/paster.py M scripts/rst2html.py M scripts/runtime_stats.py M scripts/tool_shed/migrate_tools_to_repositories.py M setup.cfg M static/maps/galaxy.interactive_environments.js.map M static/maps/layout/menu.js.map M static/maps/libs/backbone.js.map M static/maps/libs/bibtex.js.map M static/maps/libs/d3.js.map A static/maps/libs/jquery/jquery.complexify.js.map M static/maps/libs/jquery/jquery.cookie.js.map M static/maps/libs/jquery/jquery.js.map M static/maps/libs/jquery/jquery.migrate.js.map M static/maps/libs/jquery/jquery.mousewheel.js.map M static/maps/libs/raven.js.map M static/maps/libs/require.js.map M static/maps/libs/underscore.js.map M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-folderrow-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/library/library-libraryrow-view.js.map M static/maps/mvc/library/library-librarytoolbar-view.js.map M static/maps/utils/utils.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/galaxy.interactive_environments.js M static/scripts/layout/menu.js M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-folderrow-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/library/library-libraryrow-view.js M static/scripts/mvc/library/library-librarytoolbar-view.js M static/scripts/utils/utils.js M static/style/blue/base.css M static/style/blue/library.css R templates/admin/external_service/common.mako R templates/admin/external_service/create_external_service.mako R templates/admin/external_service/edit_external_service.mako R templates/admin/external_service/grid.mako R templates/admin/external_service/reload_external_service_types.mako R templates/admin/external_service/view_external_service.mako R templates/admin/request_type/common.mako R templates/admin/request_type/create_request_type.mako R templates/admin/request_type/edit_request_type.mako R templates/admin/request_type/grid.mako R templates/admin/request_type/request_type_permissions.mako R templates/admin/request_type/view_request_type.mako R templates/admin/requests/grid.mako R templates/admin/requests/reject.mako R templates/admin/requests/rename_datasets.mako R templates/admin/requests/sample_datasets_grid.mako R templates/admin/requests/view_sample_dataset.mako M templates/webapps/galaxy/admin/center.mako R templates/webapps/galaxy/requests/common/add_samples.mako R templates/webapps/galaxy/requests/common/common.mako R templates/webapps/galaxy/requests/common/create_request.mako R templates/webapps/galaxy/requests/common/edit_basic_request_info.mako R templates/webapps/galaxy/requests/common/edit_samples.mako R templates/webapps/galaxy/requests/common/find_samples.mako R templates/webapps/galaxy/requests/common/index.mako R templates/webapps/galaxy/requests/common/sample_dataset_transfer_status.mako R templates/webapps/galaxy/requests/common/sample_datasets.mako R templates/webapps/galaxy/requests/common/sample_state.mako R templates/webapps/galaxy/requests/common/view_request.mako R templates/webapps/galaxy/requests/common/view_request_history.mako R templates/webapps/galaxy/requests/common/view_sample.mako R templates/webapps/galaxy/requests/common/view_sample_datasets.mako R templates/webapps/galaxy/requests/common/view_sample_history.mako R templates/webapps/galaxy/requests/find_samples_index.mako R templates/webapps/galaxy/requests/grid.mako R templates/webapps/galaxy/requests/index.mako M test/base/testcase.py M test/functional/twilltestcase.py M test/shed_functional/base/twilltestcase.py M test/unit/managers/test_UserManager.py M test/unit/tools/test_tool_deps.py M tools/data_source/data_source.py M tools/data_source/import.py M tools/data_source/microbial_import.py M tools/data_source/microbial_import_code.py M tools/data_source/upload.py M tools/evolution/codingSnps_filter.py M tools/extract/extract_genomic_dna.py M tools/extract/liftOver_wrapper.py M tools/filters/axt_to_lav.py M tools/filters/bed_to_gff_converter.py M tools/filters/catWrapper.py M tools/filters/convert_characters.py M tools/filters/gff/extract_GFF_Features.py M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_feature_count.py M tools/filters/gff_to_bed_converter.py M tools/filters/gtf_to_bedgraph_converter.py M tools/filters/join.py M tools/filters/lav_to_bed_code.py M tools/filters/mergeCols.py M tools/filters/sff_extract.py M tools/filters/ucsc_gene_bed_to_exon_bed.py M tools/filters/ucsc_gene_bed_to_intron_bed.py M tools/filters/ucsc_gene_table_to_intervals.py M tools/genomespace/genomespace_importer.py M tools/maf/maf_by_block_number.py M tools/maf/maf_filter.py M tools/maf/maf_limit_size.py M tools/maf/maf_limit_to_species.py M tools/maf/maf_reverse_complement.py M tools/maf/maf_stats.py M tools/maf/maf_thread_for_species.py M tools/maf/maf_to_bed.py M tools/maf/vcf_to_maf_customtrack.py M tools/metag_tools/blat_wrapper.py M tools/metag_tools/shrimp_color_wrapper.py M tools/metag_tools/shrimp_wrapper.py M tools/next_gen_conversion/solid2fastq.py M tools/plotting/bar_chart.py M tools/solid_tools/maq_cs_wrapper.py M tools/solid_tools/solid_qual_stats.py M tools/sr_mapping/bfast_wrapper.py M tools/stats/aggregate_scores_in_intervals.py M tools/stats/filtering.py M tools/stats/grouping.py M tools/stats/gsummary.py Log Message: ----------- Merge branch 'dev' into remove_toolshed_installation_grid Commit: ec82e2bf2fe4df3f0af6ae78a8eb84123aeafe7b https://github.com/galaxyproject/galaxy/commit/ec82e2bf2fe4df3f0af6ae78a8eb… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Prettier, rebuild for merge. Commit: 26a9f8916d64e535a7abbd39394a765e9392a1ea https://github.com/galaxyproject/galaxy/commit/26a9f8916d64e535a7abbd39394a… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-10-30 (Mon, 30 Oct 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/mvc/toolshed/repository-queue-view.js M client/galaxy/scripts/mvc/toolshed/repository-view.js M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M static/maps/mvc/toolshed/repository-queue-view.js.map M static/maps/mvc/toolshed/repository-view.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/toolshed/repository-queue-view.js M static/scripts/mvc/toolshed/repository-view.js R templates/admin/tool_shed_repository/initiate_repository_installation.mako A templates/admin/tool_shed_repository/monitor_repository_installation.mako R templates/admin/tool_shed_repository/repository_installation_grid.mako R templates/admin/tool_shed_repository/tool_dependencies_grid.mako M test/shed_functional/base/twilltestcase.py Log Message: ----------- Merge branch 'remove_toolshed_installation_grid' into dev (post-prettier merge was simple to resolve) Compare: https://github.com/galaxyproject/galaxy/compare/62637405b591...26a9f8916d64

1 0