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

[galaxyproject/infrastructure-playbook] 93554d: Update authorized keys
by GitHub 15 May '17

15 May '17

Branch: refs/heads/master Home: https://github.com/galaxyproject/infrastructure-playbook Commit: 93554d59ad7a55ceffc0d695f3c09c3c6e515cb3 https://github.com/galaxyproject/infrastructure-playbook/commit/93554d59ad7… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: A common_env/group_vars/baseenv/vars.yml A common_env/group_vars/baseenv/vault.yml R common_env/secret_group_vars/baseenv.yml A jetstream_common/group_vars/baseenv R jetstream_common/secret_group_vars/baseenv.yml A jetstreamiuenv/group_vars/baseenv A jetstreamtaccenv/group_vars/baseenv A taccenv/group_vars/baseenv A taccenv/host_vars/galaxy-db-02.tacc.utexas.edu/vars.yml A taccenv/host_vars/galaxy-db-02.tacc.utexas.edu/vault.yml R taccenv/secret_group_vars/baseenv.yml Log Message: ----------- Update authorized keys

1 0

[galaxyproject/galaxy] 878c66: conditional postclick execution onNext
by GitHub 15 May '17

15 May '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 878c6657b471d188a6b302b546c7c8b6ec557fe8 https://github.com/galaxyproject/galaxy/commit/878c6657b471d188a6b302b546c7… Author: bagnacan <andrea.bagnacani(a)gmail.com> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M static/maps/mvc/tours.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js Log Message: ----------- conditional postclick execution onNext Commit: 1c02128275606f29c669a8119c1023b6b4b41740 https://github.com/galaxyproject/galaxy/commit/1c02128275606f29c669a8119c10… Author: bagnacan <andrea.bagnacani(a)gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js Log Message: ----------- postclick executes while onNext instead of onHide Commit: 3a9df376975d4d23aa8aa7dd29ad5803885d0b29 https://github.com/galaxyproject/galaxy/commit/3a9df376975d4d23aa8aa7dd29ad… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M static/maps/mvc/tours.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js Log Message: ----------- Merge pull request #4062 from bagnacan/conditional_postclick conditional postclick execution onNext Compare: https://github.com/galaxyproject/galaxy/compare/14b23adb1c27...3a9df376975d

1 0

[galaxyproject/galaxy] f26e35: Fix docker_dispatch dynamic destination rule for c...
by GitHub 12 May '17

12 May '17

Branch: refs/heads/release_17.05 Home: https://github.com/galaxyproject/galaxy Commit: f26e358321481500d0f993e0d7b2be9bdd1047b8 https://github.com/galaxyproject/galaxy/commit/f26e358321481500d0f993e0d7b2… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M lib/galaxy/jobs/rule_helper.py M lib/galaxy/tools/deps/containers.py Log Message: ----------- Fix docker_dispatch dynamic destination rule for container resolvers. Commit: a9faa4873e4509a60822019afe3faa4cab3f8336 https://github.com/galaxyproject/galaxy/commit/a9faa4873e4509a60822019afe3f… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M lib/galaxy/jobs/rule_helper.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py Log Message: ----------- Do not attempt to use mulled containers if tool requires legacy Galaxy environment. Commit: 185c76605f2d0da1d8e261b9b3b3a626b8ba6226 https://github.com/galaxyproject/galaxy/commit/185c76605f2d0da1d8e261b9b3b3… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M lib/galaxy/jobs/rule_helper.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py Log Message: ----------- Merge pull request #4033 from jmchilton/dispatch_fix [17.05] Fixes for containerized job executions. Compare: https://github.com/galaxyproject/galaxy/compare/0bafd683f152...185c76605f2d

1 0

[galaxyproject/galaxy] 3332df: [17.05] Fix setting up explicit container resoluti...
by GitHub 12 May '17

12 May '17

Branch: refs/heads/release_17.05 Home: https://github.com/galaxyproject/galaxy Commit: 3332dfb6717e9bd368341e0bc0aa51d3b53fa861 https://github.com/galaxyproject/galaxy/commit/3332dfb6717e9bd368341e0bc0aa… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-05-04 (Thu, 04 May 2017) Changed paths: M lib/galaxy/tools/deps/container_resolvers/explicit.py M lib/galaxy/util/plugin_config.py Log Message: ----------- [17.05] Fix setting up explicit container resolution from a container resolution config file. Commit: 0bafd683f152f28a193ee39a415018e4a8952767 https://github.com/galaxyproject/galaxy/commit/0bafd683f152f28a193ee39a4150… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M lib/galaxy/tools/deps/container_resolvers/explicit.py M lib/galaxy/util/plugin_config.py Log Message: ----------- Merge pull request #4020 from jmchilton/fix_explicit_container_resolver_from_config [17.05] Fix setting up explicit container resolution... Compare: https://github.com/galaxyproject/galaxy/compare/aa1e4cea148b...0bafd683f152

1 0

[galaxyproject/infrastructure-playbook] 48c763: Initial setup for new Main VMs
by GitHub 12 May '17

12 May '17

Branch: refs/heads/master Home: https://github.com/galaxyproject/infrastructure-playbook Commit: 48c76334902c48a35684abb08363dfc05968921d https://github.com/galaxyproject/infrastructure-playbook/commit/48c76334902… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M common_roles M taccenv/inventory M taccenv/playbook.yml Log Message: ----------- Initial setup for new Main VMs

1 0

[galaxyproject/infrastructure-playbook] 429206: Expand Grafana DB stats
by GitHub 12 May '17

12 May '17

Branch: refs/heads/master Home: https://github.com/galaxyproject/infrastructure-playbook Commit: 42920634cbd7a460054eeb0d877b0a40fbc9d7c0 https://github.com/galaxyproject/infrastructure-playbook/commit/42920634cbd… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M roles/stats/templates/galaxy_slurp.py.j2 Log Message: ----------- Expand Grafana DB stats

1 0

[galaxyproject/galaxy] a2fd8a: Remove GalaxyLogo upload from history intro tour
by GitHub 12 May '17

12 May '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a2fd8ac03521916e978b419c65fa8299b2105ec3 https://github.com/galaxyproject/galaxy/commit/a2fd8ac03521916e978b419c65fa… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M config/plugins/tours/core.history.yaml Log Message: ----------- Remove GalaxyLogo upload from history intro tour Commit: c789c53f0cfc8ff68cb16250da46600441185915 https://github.com/galaxyproject/galaxy/commit/c789c53f0cfc8ff68cb16250da46… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M config/plugins/tours/core.history.yaml Log Message: ----------- Fix minor typo in history tour Commit: 197e90c662eb23b28968486f515081f655ae67bb https://github.com/galaxyproject/galaxy/commit/197e90c662eb23b28968486f5150… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M config/plugins/tours/core.history.yaml Log Message: ----------- Replace second line (was the jpg) in upload to demonstrate multiple upload. Commit: 14b23adb1c2728b93f6dd384149104628be571ee https://github.com/galaxyproject/galaxy/commit/14b23adb1c2728b93f6dd3841491… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M config/plugins/tours/core.history.yaml Log Message: ----------- Merge pull request #4061 from dannon/tour_tweaks Very minor history tour tweaks Compare: https://github.com/galaxyproject/galaxy/compare/aab883342427...14b23adb1c27

1 0

[galaxyproject/usegalaxy-playbook] d812cd: Update DB access list
by GitHub 12 May '17

12 May '17

Branch: refs/heads/reorg Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: d812cdd806a7032a981d7f5d8c903c3957846ae7 https://github.com/galaxyproject/usegalaxy-playbook/commit/d812cdd806a7032a… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M env/test/group_vars/dbservers/vault.yml Log Message: ----------- Update DB access list

1 0

[galaxyproject/galaxy] 027962: Use panel factories
by GitHub 12 May '17

12 May '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 02796201901a476b2a8702f6b747aaba5c0adc49 https://github.com/galaxyproject/galaxy/commit/02796201901a476b2a8702f6b747… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/history-panel.js M client/galaxy/scripts/apps/tool-panel.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/layout/panel.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map Log Message: ----------- Use panel factories Commit: 9b6774026067a02fa449932deed64c60e51d207d https://github.com/galaxyproject/galaxy/commit/9b6774026067a02fa449932deed6… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/style/less/history.less M static/style/blue/base.css Log Message: ----------- Add history styles Commit: 3ff41fd75929f0be605e7ade3f8617495a41cb32 https://github.com/galaxyproject/galaxy/commit/3ff41fd75929f0be605e7ade3f86… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/scripts/apps/login.js Log Message: ----------- Revise login Commit: c85ab150091e13c87aa5d39e2633c636646499d2 https://github.com/galaxyproject/galaxy/commit/c85ab150091e13c87aa5d39e2633… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/scripts/apps/login.js M client/galaxy/scripts/mvc/ui/ui-buttons.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map Log Message: ----------- Fix login page, add tool tips to panel buttons Commit: 31a4c87be9051b3f1279a18460fab4fc89832efc https://github.com/galaxyproject/galaxy/commit/31a4c87be9051b3f1279a18460fa… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Fix routing Commit: 8b572a8763203877eebc2a4b43001740c1531d2f https://github.com/galaxyproject/galaxy/commit/8b572a8763203877eebc2a4b4300… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Remove unused panel import Commit: 584ae5bdf43e1c7f980c08c0bfe26d6d6b2d3ae2 https://github.com/galaxyproject/galaxy/commit/584ae5bdf43e1c7f980c08c0bfe2… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js Log Message: ----------- Remove dotted comments Commit: 50f17132e0ed79b3dbdaeb2e6e71c56733b7ad76 https://github.com/galaxyproject/galaxy/commit/50f17132e0ed79b3dbdaeb2e6e71… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js Log Message: ----------- Remove space Commit: d90c75b1853ff35a61e008ebfe2b1060ee4c3b83 https://github.com/galaxyproject/galaxy/commit/d90c75b1853ff35a61e008ebfe2b… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/history-panel.js M client/galaxy/scripts/apps/tool-panel.js M client/galaxy/scripts/layout/page.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Reduce global usage in router Commit: c8c5f3d0d5131f39ee44a2bd520db903156ec49c https://github.com/galaxyproject/galaxy/commit/c8c5f3d0d5131f39ee44a2bd520d… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/scripts/layout/page.js M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Resolve naming conflict between config and options Commit: cdee899a9d07decf84a260f6da39c9b665b0cd9a https://github.com/galaxyproject/galaxy/commit/cdee899a9d07decf84a260f6da39… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-08 (Mon, 08 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Use local selector Commit: cfb1b7307d3d516094e8631424d037eb49768db6 https://github.com/galaxyproject/galaxy/commit/cfb1b7307d3d516094e8631424d0… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-09 (Tue, 09 May 2017) Changed paths: M client/galaxy/scripts/apps/login.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map Log Message: ----------- Fix login page app options Commit: adc6ce5d4d2826436fedcb78dad6b1e86022d808 https://github.com/galaxyproject/galaxy/commit/adc6ce5d4d2826436fedcb78dad6… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-09 (Tue, 09 May 2017) Changed paths: M client/galaxy/scripts/apps/login.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map Log Message: ----------- Use local jquery selector Commit: 4c86628fddd09328981bc1553b221cc2a29aa596 https://github.com/galaxyproject/galaxy/commit/4c86628fddd09328981bc1553b22… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-09 (Tue, 09 May 2017) Changed paths: M client/galaxy/scripts/layout/menu.js M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Fix webhook access to masthead collection Commit: 98b322777711dd029405e5e3fc777df178104374 https://github.com/galaxyproject/galaxy/commit/98b322777711dd029405e5e3fc77… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-10 (Wed, 10 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/login.js M client/galaxy/scripts/layout/page.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map Log Message: ----------- Return separate View component for Page module Commit: b3529e78c055c2ced8fa6ee2a7e02ee7505b90f3 https://github.com/galaxyproject/galaxy/commit/b3529e78c055c2ced8fa6ee2a7e0… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/tool-panel.js M client/galaxy/scripts/layout/menu.js A client/galaxy/scripts/mvc/workflow/workflow.js A client/galaxy/scripts/nls/de/locale.js A client/galaxy/scripts/nls/es/locale.js M client/galaxy/scripts/nls/fr/locale.js M client/galaxy/scripts/nls/locale.js M client/galaxy/style/less/base.less M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M static/maps/layout/menu.js.map A static/maps/mvc/workflow/workflow.js.map A static/maps/nls/de/locale.js.map A static/maps/nls/es/locale.js.map M static/maps/nls/fr/locale.js.map M static/maps/nls/locale.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js A static/scripts/mvc/workflow/workflow.js A static/scripts/nls/de/locale.js A static/scripts/nls/es/locale.js M static/scripts/nls/fr/locale.js M static/scripts/nls/locale.js M static/style/blue/base.css R templates/webapps/galaxy/workflow/list.mako R templates/webapps/galaxy/workflow/list_for_run.mako M test/api/test_workflows.py M test/galaxy_selenium/navigates_galaxy.py M test/selenium_tests/framework.py M test/selenium_tests/test_tool_form.py M test/selenium_tests/test_workflow_management.py Log Message: ----------- Merge branch 'dev' into refactor_panels_000 Commit: fad855d29b606da76f427fbe8758f6e9b3c7e677 https://github.com/galaxyproject/galaxy/commit/fad855d29b606da76f427fbe8758… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M static/maps/layout/menu.js.map M static/maps/layout/page.js.map M static/maps/layout/panel.js.map M static/maps/mvc/ui/ui-buttons.js.map M static/scripts/layout/menu.js M static/scripts/layout/page.js M static/scripts/layout/panel.js M static/scripts/mvc/ui/ui-buttons.js M static/style/blue/base.css Log Message: ----------- Make client Commit: 500ae33e1f77da53495a4b81671c46e7a051e84c https://github.com/galaxyproject/galaxy/commit/500ae33e1f77da53495a4b81671c… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Fix router Commit: e49e5e5417e8e2ebc0347b9cbbdf91c52d4779eb https://github.com/galaxyproject/galaxy/commit/e49e5e5417e8e2ebc0347b9cbbdf… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/layout/page.js M test/qunit/tests/page_tests.js Log Message: ----------- Fix test cases Commit: aab8833424273a1f2f8299eb484421c5ae6160ba https://github.com/galaxyproject/galaxy/commit/aab8833424273a1f2f8299eb4844… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-05-12 (Fri, 12 May 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/history-panel.js M client/galaxy/scripts/apps/login.js M client/galaxy/scripts/apps/tool-panel.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/layout/panel.js M client/galaxy/scripts/mvc/ui/ui-buttons.js M client/galaxy/style/less/history.less M static/maps/layout/menu.js.map M static/maps/layout/page.js.map M static/maps/layout/panel.js.map M static/maps/mvc/ui/ui-buttons.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/layout/menu.js M static/scripts/layout/page.js M static/scripts/layout/panel.js M static/scripts/mvc/ui/ui-buttons.js M static/style/blue/base.css M test/qunit/tests/page_tests.js Log Message: ----------- Merge commit 'e49e5e5417e8e2ebc0347b9cbbdf91c52d4779eb' into dev Compare: https://github.com/galaxyproject/galaxy/compare/2eeabc00b19c...aab883342427

1 0

[galaxyproject/galaxy] 04bb1e: [17.05] Fix FTP upload of multiple files in collec...
by GitHub 11 May '17

11 May '17

Branch: refs/heads/release_17.05 Home: https://github.com/galaxyproject/galaxy Commit: 04bb1e85cd16a04d6968c8d10755bd5e142831b1 https://github.com/galaxyproject/galaxy/commit/04bb1e85cd16a04d6968c8d10755… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-view.js M static/maps/mvc/upload/collection/collection-view.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/upload/collection/collection-view.js Log Message: ----------- [17.05] Fix FTP upload of multiple files in collection uploader. Commit: aa1e4cea148ba6a1683d905704191e64ee64a46c https://github.com/galaxyproject/galaxy/commit/aa1e4cea148ba6a1683d90570419… Author: Martin Cech <marten(a)bx.psu.edu> Date: 2017-05-11 (Thu, 11 May 2017) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-view.js M static/maps/mvc/upload/collection/collection-view.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/upload/collection/collection-view.js Log Message: ----------- Merge pull request #4058 from jmchilton/upload_ftp_fix [17.05] Fix FTP upload of multiple files in collection uploader. Compare: https://github.com/galaxyproject/galaxy/compare/9940ae70309a...aa1e4cea148b

1 0