- galaxy-commits - lists.galaxyproject.org

[galaxyproject/galaxy] 72faca: Document GIE proxy config for nginx, mention the A...
by GitHub 18 Nov '15

18 Nov '15

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 72faca1a3a81b6104c776353ee7b4dc03d6ae9be https://github.com/galaxyproject/galaxy/commit/72faca1a3a81b6104c776353ee7b… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Document GIE proxy config for nginx, mention the Ansible role. Commit: 7ab070e9df6ebf0658c966942d38779fbc9d16f1 https://github.com/galaxyproject/galaxy/commit/7ab070e9df6ebf0658c966942d38… Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M doc/source/admin/interactive_environments.rst Log Message: ----------- Merge pull request #1123 from natefoo/ie-docfix Add nginx config for GIE proxy to documentation Compare: https://github.com/galaxyproject/galaxy/compare/f770128915df...7ab070e9df6e

1 0

[galaxyproject/galaxy] e7d535: Fixes #932
by GitHub 18 Nov '15

18 Nov '15

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e7d5355f7b064fb0eb4063e905d6b32df1ed7a12 https://github.com/galaxyproject/galaxy/commit/e7d5355f7b064fb0eb4063e905d6… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2015-10-26 (Mon, 26 Oct 2015) Changed paths: M lib/galaxy/datatypes/data.py Log Message: ----------- Fixes #932 But probably at great cost? This seems like basic functionality that I'm changing though a proper HTTPException is obviously the 'right thing to do'(tm) Commit: f770128915df3fa9d8a3a9fe2c4a210fbd9ac2c6 https://github.com/galaxyproject/galaxy/commit/f770128915df3fa9d8a3a9fe2c4a… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/datatypes/data.py Log Message: ----------- Merge pull request #991 from erasche/fix-932 Fixes #932 Compare: https://github.com/galaxyproject/galaxy/compare/e4e44be27b7b...f770128915df

1 0

[galaxyproject/galaxy] bafb8a: Add uniprotxml datatype
by GitHub 18 Nov '15

18 Nov '15

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: bafb8a9a4d31191a102e5d8c442cbfc82d3ad97e https://github.com/galaxyproject/galaxy/commit/bafb8a9a4d31191a102e5d8c442c… Author: Jim Johnson <jj(a)umn.edu> Date: 2015-10-29 (Thu, 29 Oct 2015) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Add uniprotxml datatype Commit: 4e6c46fa25cd7f23625d2029b57aad0e67bb732a https://github.com/galaxyproject/galaxy/commit/4e6c46fa25cd7f23625d2029b57a… Author: Jim Johnson <jj(a)umn.edu> Date: 2015-10-29 (Thu, 29 Oct 2015) Changed paths: M lib/galaxy/datatypes/proteomics.py Log Message: ----------- Add UniProtXML datatype to proteomics.py Commit: 2a7bba5abaeef0c71c6b86bbbcaf4cdbb0cf7a31 https://github.com/galaxyproject/galaxy/commit/2a7bba5abaeef0c71c6b86bbbcaf… Author: Jim Johnson <jj(a)umn.edu> Date: 2015-11-02 (Mon, 02 Nov 2015) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Add UniProtXML sniffer tag Commit: e4e44be27b7b3ddf778eb95559b4d0f11e4aecb7 https://github.com/galaxyproject/galaxy/commit/e4e44be27b7b3ddf778eb95559b4… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/proteomics.py Log Message: ----------- Merge pull request #1004 from jj-umn/uniprotxml_datatype UniProtXML datatype Compare: https://github.com/galaxyproject/galaxy/compare/7fef50f45fb6...e4e44be27b7b

1 0

[galaxyproject/galaxy] 28065b: Fix the issue where too many datasets are linked t...
by GitHub 18 Nov '15

18 Nov '15

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 28065b6ee7eaa15a7607c17316050939781b8cff https://github.com/galaxyproject/galaxy/commit/28065b6ee7eaa15a7607c1731605… Author: Jelle Scholtalbers <j.scholtalbers(a)gmail.com> Date: 2015-10-09 (Fri, 09 Oct 2015) Changed paths: M lib/galaxy/web/base/controllers/admin.py Log Message: ----------- Fix the issue where too many datasets are linked to a certain role and the page will not load - or takes too long for the proxy Commit: 7fef50f45fb6484fcb600cfd167e43d1a735a9d2 https://github.com/galaxyproject/galaxy/commit/7fef50f45fb6484fcb600cfd167e… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/web/base/controllers/admin.py Log Message: ----------- Merge pull request #881 from scholtalbers/role-page-fix Fix the issue where too many datasets are linked to a certain role Compare: https://github.com/galaxyproject/galaxy/compare/ee2b34c387d9...7fef50f45fb6

1 0

[galaxyproject/usegalaxy-playbook] 15e3e5: Set $HOME for Galaxy processes.
by GitHub 18 Nov '15

18 Nov '15

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 15e3e529e1c9dddbf9d2dc8dde8f1e9c55076f2f https://github.com/galaxyproject/usegalaxy-playbook/commit/15e3e529e1c9dddb… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M templates/supervisor/galaxy.conf.j2 Log Message: ----------- Set $HOME for Galaxy processes. Commit: 1cb189cec659569cebbb2053ac62feb79f76c13b https://github.com/galaxyproject/usegalaxy-playbook/commit/1cb189cec659569c… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M files/galaxy/test.galaxyproject.org/var/integrated_tool_panel.xml M files/galaxy/test.galaxyproject.org/var/shed_tool_conf.xml M files/galaxy/test.galaxyproject.org/var/shed_tool_data_table_conf.xml Log Message: ----------- Test mutable configs Commit: 9fe17d3e77e75e7af7ad2394287f2b4050c40fe9 https://github.com/galaxyproject/usegalaxy-playbook/commit/9fe17d3e77e75e7a… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: A roles/galaxyprojectdotorg.interactive_environments/README.md A roles/galaxyprojectdotorg.interactive_environments/defaults/main.yml A roles/galaxyprojectdotorg.interactive_environments/handlers/main.yml A roles/galaxyprojectdotorg.interactive_environments/meta/.galaxy_install_info A roles/galaxyprojectdotorg.interactive_environments/meta/main.yml A roles/galaxyprojectdotorg.interactive_environments/tasks/docker_ssl.yml A roles/galaxyprojectdotorg.interactive_environments/tasks/extract_component.yml A roles/galaxyprojectdotorg.interactive_environments/tasks/install_dependencies.yml A roles/galaxyprojectdotorg.interactive_environments/tasks/main.yml A roles/galaxyprojectdotorg.interactive_environments/tasks/supervisor.yml A roles/galaxyprojectdotorg.interactive_environments/tasks/synchronize_components.yml A roles/galaxyprojectdotorg.interactive_environments/tasks/webserver_conf.yml A roles/galaxyprojectdotorg.interactive_environments/templates/_prefix.j2 A roles/galaxyprojectdotorg.interactive_environments/templates/config.ini.j2 A roles/galaxyprojectdotorg.interactive_environments/templates/ipython_apache.conf.j2 A roles/galaxyprojectdotorg.interactive_environments/templates/ipython_nginx.conf.j2 A roles/galaxyprojectdotorg.interactive_environments/templates/proxy_supervisor.conf.j2 Log Message: ----------- Add the interactive_environments role Commit: 9d483c5c7cfb38539cabd9fecdaca23857cef6e6 https://github.com/galaxyproject/usegalaxy-playbook/commit/9d483c5c7cfb3853… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M galaxy.yml A stage/files/interactive_environments/plugins/.ansible_ie_role_current_version A stage/files/interactive_environments/plugins/common/templates/ie.mako A stage/files/interactive_environments/plugins/interactive_environments.dtd A stage/files/interactive_environments/plugins/ipython/config/ipython.ini.sample A stage/files/interactive_environments/plugins/ipython/config/ipython.xml A stage/files/interactive_environments/plugins/ipython/static/js/ipython.js A stage/files/interactive_environments/plugins/ipython/templates/ipython.mako A stage/files/interactive_environments/plugins/ipython/templates/notebook.ipynb A stage/files/interactive_environments/plugins/rstudio/config/rstudio.ini.sample A stage/files/interactive_environments/plugins/rstudio/config/rstudio.xml A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/base64.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/jsbn.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/prng4.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/rng.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/rsa.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio.big.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio.min.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio/base64.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio/jsbn.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio/prng4.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio/rng.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio/rsa.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/wu/base64.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/wu/jsbn.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/wu/prng4.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/wu/rng.js A stage/files/interactive_environments/plugins/rstudio/static/js/crypto/wu/rsa.js A stage/files/interactive_environments/plugins/rstudio/static/js/rstudio.js A stage/files/interactive_environments/plugins/rstudio/templates/rstudio.mako A stage/files/interactive_environments/proxy/.ansible_ie_role_current_version A stage/files/interactive_environments/proxy/Dockerfile A stage/files/interactive_environments/proxy/README.md A stage/files/interactive_environments/proxy/lib/main.js A stage/files/interactive_environments/proxy/lib/mapper.js A stage/files/interactive_environments/proxy/lib/proxy.js A stage/files/interactive_environments/proxy/package.json M stage/group_vars/all.yml M stage/group_vars/galaxyservers.yml M stage/secret_vars/galaxyservers.yml Log Message: ----------- Update Test and use the interactive_environments role to deploy IPython Commit: ac7af1a513fe1c3f3a121398ebfb912734bd5c1e https://github.com/galaxyproject/usegalaxy-playbook/commit/ac7af1a513fe1c3f… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: A production/files/interactive_environments/plugins/.ansible_ie_role_current_version A production/files/interactive_environments/plugins/common/templates/ie.mako A production/files/interactive_environments/plugins/interactive_environments.dtd A production/files/interactive_environments/plugins/ipython/config/ipython.ini.sample A production/files/interactive_environments/plugins/ipython/config/ipython.xml A production/files/interactive_environments/plugins/ipython/static/js/ipython.js A production/files/interactive_environments/plugins/ipython/templates/ipython.mako A production/files/interactive_environments/plugins/ipython/templates/notebook.ipynb A production/files/interactive_environments/plugins/rstudio/config/rstudio.ini.sample A production/files/interactive_environments/plugins/rstudio/config/rstudio.xml A production/files/interactive_environments/plugins/rstudio/static/js/crypto/base64.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/jsbn.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/prng4.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/rng.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/rsa.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio.big.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio.min.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio/base64.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio/jsbn.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio/prng4.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio/rng.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/rstudio/rsa.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/wu/base64.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/wu/jsbn.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/wu/prng4.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/wu/rng.js A production/files/interactive_environments/plugins/rstudio/static/js/crypto/wu/rsa.js A production/files/interactive_environments/plugins/rstudio/static/js/rstudio.js A production/files/interactive_environments/plugins/rstudio/templates/rstudio.mako A production/files/interactive_environments/proxy/.ansible_ie_role_current_version A production/files/interactive_environments/proxy/Dockerfile A production/files/interactive_environments/proxy/README.md A production/files/interactive_environments/proxy/lib/main.js A production/files/interactive_environments/proxy/lib/mapper.js A production/files/interactive_environments/proxy/lib/proxy.js A production/files/interactive_environments/proxy/package.json M production/group_vars/all.yml M production/group_vars/galaxyservers.yml M production/host_vars/galaxy-web-01.tacc.utexas.edu.yml M production/secret_vars/galaxyservers.yml Log Message: ----------- Deploy the IPython IE on Main Compare: https://github.com/galaxyproject/usegalaxy-playbook/compare/23c400852d03...…

1 0

[galaxyproject/galaxy] fe0f9b: Add BIOM v1 in default datatypes.
by GitHub 18 Nov '15

18 Nov '15

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: fe0f9ba905f11cfff4407aa574fa761e5eadf2f5 https://github.com/galaxyproject/galaxy/commit/fe0f9ba905f11cfff4407aa574fa… Author: fescudie <fescudie(a)toulouse.inra.fr> Date: 2015-10-20 (Tue, 20 Oct 2015) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/text.py Log Message: ----------- Add BIOM v1 in default datatypes. Commit: e834b6e189ff0e4e17b1cd3ac541f96a44ba1249 https://github.com/galaxyproject/galaxy/commit/e834b6e189ff0e4e17b1cd3ac541… Author: fescudie <fescudie(a)toulouse.inra.fr> Date: 2015-10-20 (Tue, 20 Oct 2015) Changed paths: M lib/galaxy/datatypes/text.py Log Message: ----------- Add BIOM v1 in default datatypes Commit: ee2b34c387d9bb6189c8befaa069887b535d413c https://github.com/galaxyproject/galaxy/commit/ee2b34c387d9bb6189c8befaa069… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/text.py Log Message: ----------- Merge pull request #950 from fescudie/dev Add BIOM v1 in default datatypes. Compare: https://github.com/galaxyproject/galaxy/compare/c252987b4c5f...ee2b34c387d9

1 0

[galaxyproject/galaxy] 05f3da: Fix macro bug with empty CDATA being None instead ...
by GitHub 18 Nov '15

18 Nov '15

Branch: refs/heads/release_15.10 Home: https://github.com/galaxyproject/galaxy Commit: 05f3da308d6a58dc8528f317fa6ea4ffa1fb7610 https://github.com/galaxyproject/galaxy/commit/05f3da308d6a58dc8528f317fa6e… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/util/xml_macros.py M test/unit/tools/test_tool_loader.py Log Message: ----------- Fix macro bug with empty CDATA being None instead of ''. Fixes galaxyproject/planemo#362 thanks for the report @erasche. Test using the following command: ``` nosetests test/unit/tools/test_tool_loader.py ``` Commit: eb16ba3743a7e42cc9ad43f0d7a3eb926ba60cd8 https://github.com/galaxyproject/galaxy/commit/eb16ba3743a7e42cc9ad43f0d7a3… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/util/xml_macros.py M test/unit/tools/test_tool_loader.py Log Message: ----------- Merge pull request #1122 from jmchilton/empty_cdata_macro [15.10] Fix macro bug with empty CDATA being None instead of ''. Compare: https://github.com/galaxyproject/galaxy/compare/73f46f4e0814...eb16ba3743a7

1 0

[galaxyproject/galaxy] 937f99: Fix API installation of tool_dependencies
by GitHub 18 Nov '15

18 Nov '15

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 937f99b851e2078152c851a0b552c00b99167747 https://github.com/galaxyproject/galaxy/commit/937f99b851e2078152c851a0b552… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2015-11-15 (Sun, 15 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/api/repositories.py Log Message: ----------- Fix API installation of tool_dependencies This should fix an installation issue with tool_dependencies via the API. Tool dependency repositories to not have any tools specified and with this no metadata associated. It was broken in https://github.com/galaxyproject/galaxy/commit/bb6a784f13ff3f91762244d44884… So I think this should be part of 15.10. Thanks to Greg for fixing this one. Commit: 040118aae35da2c72fbf6332b32e8f3e0025a341 https://github.com/galaxyproject/galaxy/commit/040118aae35da2c72fbf6332b32e… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2015-11-16 (Mon, 16 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Encode unicode string before passing to hashlib.sha1(). Fixes #673. Commit: 3ffa607c15a70a532a7d21a0b3b1a46171e53171 https://github.com/galaxyproject/galaxy/commit/3ffa607c15a70a532a7d21a0b3b1… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M client/galaxy/scripts/galaxy.menu.js M static/maps/galaxy.menu.js.map M static/scripts/galaxy.menu.js Log Message: ----------- Deprecate old library UI in the "Shared Data" menu. Commit: e61e30cde549c448375b555aadfc85b235b4871a https://github.com/galaxyproject/galaxy/commit/e61e30cde549c448375b555aadfc… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/api/repositories.py Log Message: ----------- Merge pull request #1100 from martenson/fix-ts-api-install [15.10] Fix API installation of tool_dependencies Commit: 05e66827d40151c0cd1729299fa82a510138359e https://github.com/galaxyproject/galaxy/commit/05e66827d40151c0cd1729299fa8… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M client/galaxy/scripts/galaxy.menu.js M static/maps/galaxy.menu.js.map M static/scripts/galaxy.menu.js Log Message: ----------- Merge pull request #1112 from nsoranzo/release_15.10_data_libraries_beta [15.10] Deprecate old library UI in the "Shared Data" menu. Commit: 27dc31ace9a4e3a28ab2416c8f9cdbe4735c7063 https://github.com/galaxyproject/galaxy/commit/27dc31ace9a4e3a28ab2416c8f9c… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Merge pull request #1106 from nsoranzo/release_15.07_library_import_utf8 [15.07] Encode unicode string before passing to hashlib.sha1(). Commit: 73f46f4e08141f78927056fa3e4709d0ab323972 https://github.com/galaxyproject/galaxy/commit/73f46f4e08141f78927056fa3e47… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Merge branch 'release_15.07' into release_15.10 Commit: c252987b4c5febb7fa10db3c7359449f325fc9ca https://github.com/galaxyproject/galaxy/commit/c252987b4c5febb7fa10db3c7359… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M client/galaxy/scripts/galaxy.menu.js M lib/galaxy/webapps/galaxy/api/remote_files.py M static/maps/galaxy.menu.js.map M static/scripts/galaxy.menu.js Log Message: ----------- Merge branch 'master' into dev Compare: https://github.com/galaxyproject/galaxy/compare/3d933edd32dd...c252987b4c5f

1 0

[galaxyproject/galaxy] d824cc: In interactive environments, the /import volume ca...
by GitHub 18 Nov '15

18 Nov '15

Branch: refs/heads/master Home: https://github.com/galaxyproject/galaxy Commit: d824cca31fcebe97b8c7cfd1040eecbb9e5f03d3 https://github.com/galaxyproject/galaxy/commit/d824cca31fcebe97b8c7cfd1040e… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2015-11-12 (Thu, 12 Nov 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/ipython/templates/ipython.mako M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- In interactive environments, the /import volume can now be made conditional. Also, fix a bug when using a proxy for the node proxy and cookie_path is / Commit: c4351413265796dacc15b8e3fc7382b8514f5b59 https://github.com/galaxyproject/galaxy/commit/c4351413265796dacc15b8e3fc73… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2015-11-13 (Fri, 13 Nov 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample Log Message: ----------- Built image tag differs from intended. Commit: 64b084067c73cea1de455e4816d73101c3752165 https://github.com/galaxyproject/galaxy/commit/64b084067c73cea1de455e4816d7… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2015-11-13 (Fri, 13 Nov 2015) Changed paths: M config/plugins/interactive_environments/ipython/config/ipython.ini.sample M config/plugins/interactive_environments/ipython/templates/ipython.mako M lib/galaxy/web/base/interactive_environments.py Log Message: ----------- Merge pull request #1076 from natefoo/ie-conditional-import-volume [15.10] Fix a bug in IEs when proxying the proxy Commit: 75e7e4c2cf7a0cb18b8096c8119e4b0cb207e2a3 https://github.com/galaxyproject/galaxy/commit/75e7e4c2cf7a0cb18b8096c8119e… Author: Dave B <dave(a)bx.psu.edu> Date: 2015-11-14 (Sat, 14 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py Log Message: ----------- Fix 500 error when attempting to update installed repository. Commit: 7150983aab78e4ceb71f8ad2592369523899d768 https://github.com/galaxyproject/galaxy/commit/7150983aab78e4ceb71f8ad25923… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2015-11-14 (Sat, 14 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py Log Message: ----------- Merge pull request #1093 from martenson/release_15.10 [15.10] Fix 500 error when attempting to update installed repository. Commit: 937f99b851e2078152c851a0b552c00b99167747 https://github.com/galaxyproject/galaxy/commit/937f99b851e2078152c851a0b552… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2015-11-15 (Sun, 15 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/api/repositories.py Log Message: ----------- Fix API installation of tool_dependencies This should fix an installation issue with tool_dependencies via the API. Tool dependency repositories to not have any tools specified and with this no metadata associated. It was broken in https://github.com/galaxyproject/galaxy/commit/bb6a784f13ff3f91762244d44884… So I think this should be part of 15.10. Thanks to Greg for fixing this one. Commit: 040118aae35da2c72fbf6332b32e8f3e0025a341 https://github.com/galaxyproject/galaxy/commit/040118aae35da2c72fbf6332b32e… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2015-11-16 (Mon, 16 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Encode unicode string before passing to hashlib.sha1(). Fixes #673. Commit: 3ffa607c15a70a532a7d21a0b3b1a46171e53171 https://github.com/galaxyproject/galaxy/commit/3ffa607c15a70a532a7d21a0b3b1… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M client/galaxy/scripts/galaxy.menu.js M static/maps/galaxy.menu.js.map M static/scripts/galaxy.menu.js Log Message: ----------- Deprecate old library UI in the "Shared Data" menu. Commit: e61e30cde549c448375b555aadfc85b235b4871a https://github.com/galaxyproject/galaxy/commit/e61e30cde549c448375b555aadfc… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M lib/galaxy/webapps/tool_shed/api/repositories.py Log Message: ----------- Merge pull request #1100 from martenson/fix-ts-api-install [15.10] Fix API installation of tool_dependencies Commit: 05e66827d40151c0cd1729299fa82a510138359e https://github.com/galaxyproject/galaxy/commit/05e66827d40151c0cd1729299fa8… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M client/galaxy/scripts/galaxy.menu.js M static/maps/galaxy.menu.js.map M static/scripts/galaxy.menu.js Log Message: ----------- Merge pull request #1112 from nsoranzo/release_15.10_data_libraries_beta [15.10] Deprecate old library UI in the "Shared Data" menu. Commit: 27dc31ace9a4e3a28ab2416c8f9cdbe4735c7063 https://github.com/galaxyproject/galaxy/commit/27dc31ace9a4e3a28ab2416c8f9c… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Merge pull request #1106 from nsoranzo/release_15.07_library_import_utf8 [15.07] Encode unicode string before passing to hashlib.sha1(). Commit: 73f46f4e08141f78927056fa3e4709d0ab323972 https://github.com/galaxyproject/galaxy/commit/73f46f4e08141f78927056fa3e47… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Merge branch 'release_15.07' into release_15.10 Compare: https://github.com/galaxyproject/galaxy/compare/a3034ab6d99d...73f46f4e0814

1 0

[galaxyproject/galaxy] 040118: Encode unicode string before passing to hashlib.sh...
by GitHub 18 Nov '15

18 Nov '15

Branch: refs/heads/release_15.10 Home: https://github.com/galaxyproject/galaxy Commit: 040118aae35da2c72fbf6332b32e8f3e0025a341 https://github.com/galaxyproject/galaxy/commit/040118aae35da2c72fbf6332b32e… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2015-11-16 (Mon, 16 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Encode unicode string before passing to hashlib.sha1(). Fixes #673. Commit: 27dc31ace9a4e3a28ab2416c8f9cdbe4735c7063 https://github.com/galaxyproject/galaxy/commit/27dc31ace9a4e3a28ab2416c8f9c… Author: John Chilton <jmchilton(a)gmail.com> Date: 2015-11-17 (Tue, 17 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Merge pull request #1106 from nsoranzo/release_15.07_library_import_utf8 [15.07] Encode unicode string before passing to hashlib.sha1(). Commit: 73f46f4e08141f78927056fa3e4709d0ab323972 https://github.com/galaxyproject/galaxy/commit/73f46f4e08141f78927056fa3e47… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/remote_files.py Log Message: ----------- Merge branch 'release_15.07' into release_15.10 Compare: https://github.com/galaxyproject/galaxy/compare/05e66827d401...73f46f4e0814

1 0