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

[galaxyproject/usegalaxy-playbook] 6d6da7: Supervisor and GIE path fixes
by GitHub 16 Jul '17

16 Jul '17

Branch: refs/heads/reorg Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 6d6da7427592691795bc94efed9441f278369338 https://github.com/galaxyproject/usegalaxy-playbook/commit/6d6da74275926917… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-07-16 (Sun, 16 Jul 2017) Changed paths: M common_roles M env/common/templates/supervisor/galaxy_group.j2 M env/main/group_vars/dbservers/vault.yml M env/main/group_vars/ftpservers/vars.yml M env/main/group_vars/galaxyservers/vars.yml M env/main/group_vars/galaxywebservers.yml M env/main/inventory M env/test/group_vars/galaxyservers/vars.yml Log Message: ----------- Supervisor and GIE path fixes

1 0

[galaxyproject/galaxy] 37ef9a: Copy tags on HDCA, add tags when dictifying
by GitHub 14 Jul '17

14 Jul '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 37ef9a982488fd7601d9fab9d11fca5a7c66cf81 https://github.com/galaxyproject/galaxy/commit/37ef9a982488fd7601d9fab9d11f… Author: Peter van Heusden <pvh(a)sanbi.ac.za> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/managers/collections.py M lib/galaxy/model/__init__.py Log Message: ----------- Copy tags on HDCA, add tags when dictifying Commit: f0e5ec175df397cb5a22499be6fb08b137f35a1a https://github.com/galaxyproject/galaxy/commit/f0e5ec175df397cb5a22499be6fb… Author: Peter van Heusden <pvh(a)sanbi.ac.za> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M client/galaxy/scripts/galaxy.library.js M client/galaxy/scripts/mvc/library/library-librarylist-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M lib/galaxy/managers/workflows.py M static/maps/galaxy.library.js.map M static/maps/mvc/library/library-librarylist-view.js.map M static/maps/mvc/library/library-librarytoolbar-view.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map M static/scripts/galaxy.library.js M static/scripts/mvc/library/library-librarylist-view.js M static/scripts/mvc/library/library-librarytoolbar-view.js M static/scripts/mvc/tool/tool-form-base.js A test-data/5_Ig-like.gff M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_attribute.xml M tools/filters/wc_gnu.xml Log Message: ----------- Merge branch 'dev' of github.com:pvanheus/galaxy into dev Commit: 37cb522db431c000ec4cf9a33f385863346c3519 https://github.com/galaxyproject/galaxy/commit/37cb522db431c000ec4cf9a33f38… Author: Peter van Heusden <pvh(a)sanbi.ac.za> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/managers/collections.py Log Message: ----------- copy tags using tag manager Commit: bf8b15632551f2e22cf890d192dae5d812e0c71b https://github.com/galaxyproject/galaxy/commit/bf8b15632551f2e22cf890d192da… Author: Peter van Heusden <pvh(a)sanbi.ac.za> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Move tag copying into HasTags mixin Commit: 484d581099fd0d54aec8d5128e61322add4db7ea https://github.com/galaxyproject/galaxy/commit/484d581099fd0d54aec8d5128e61… Author: Peter van Heusden <pvh(a)sanbi.ac.za> Date: 2017-07-06 (Thu, 06 Jul 2017) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Remove inheritance from object in HasTags Commit: 35d67eaf488689d2f46c1d579ced77a029e8bfab https://github.com/galaxyproject/galaxy/commit/35d67eaf488689d2f46c1d579ced… Author: Peter van Heusden <pvh(a)sanbi.ac.za> Date: 2017-07-06 (Thu, 06 Jul 2017) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Put back inheritance from object in HasTags Commit: 0f2fe60af44c4d2a811cd7a98ccea1ab17cdc015 https://github.com/galaxyproject/galaxy/commit/0f2fe60af44c4d2a811cd7a98cce… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-07-14 (Fri, 14 Jul 2017) Changed paths: M lib/galaxy/managers/collections.py M lib/galaxy/model/__init__.py Log Message: ----------- Merge pull request #4277 from pvanheus/dev Ensure tags are copied and presented when moving Collections Compare: https://github.com/galaxyproject/galaxy/compare/edb762d2675a...0f2fe60af44c

1 0

[galaxyproject/usegalaxy-playbook] 0638aa: Temporarily bump Interval2Maf1 to 32GB for Wilfrie...
by GitHub 14 Jul '17

14 Jul '17

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 0638aacc35f69f09d956f1c87c839770f622ac5a https://github.com/galaxyproject/usegalaxy-playbook/commit/0638aacc35f69f09… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-07-14 (Fri, 14 Jul 2017) Changed paths: M templates/galaxy/usegalaxy.org/config/job_conf.xml.j2 Log Message: ----------- Temporarily bump Interval2Maf1 to 32GB for Wilfried

1 0

[galaxyproject/galaxy] 6a77a1: Script doc correction
by GitHub 14 Jul '17

14 Jul '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 6a77a186a8c359a2f628c010cfbc83dc1d3031ad https://github.com/galaxyproject/galaxy/commit/6a77a186a8c359a2f628c010cfbc… Author: Enis Afgan <afgane(a)gmail.com> Date: 2017-07-14 (Fri, 14 Jul 2017) Changed paths: M scripts/runtime_stats.py Log Message: ----------- Script doc correction Commit: edb762d2675aa674f52f3ba3fbd97e2bfe447eaa https://github.com/galaxyproject/galaxy/commit/edb762d2675aa674f52f3ba3fbd9… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-07-14 (Fri, 14 Jul 2017) Changed paths: M scripts/runtime_stats.py Log Message: ----------- Merge pull request #4316 from galaxyproject/afgane-patch-1 Script doc correction Compare: https://github.com/galaxyproject/galaxy/compare/80b2f1ef3c6c...edb762d2675a

1 0

[galaxyproject/galaxy] 6a77a1: Script doc correction
by GitHub 14 Jul '17

14 Jul '17

Branch: refs/heads/afgane-patch-1 Home: https://github.com/galaxyproject/galaxy Commit: 6a77a186a8c359a2f628c010cfbc83dc1d3031ad https://github.com/galaxyproject/galaxy/commit/6a77a186a8c359a2f628c010cfbc… Author: Enis Afgan <afgane(a)gmail.com> Date: 2017-07-14 (Fri, 14 Jul 2017) Changed paths: M scripts/runtime_stats.py Log Message: ----------- Script doc correction

1 0

[galaxyproject/usegalaxy-playbook] f9e62c: Update access list
by GitHub 14 Jul '17

14 Jul '17

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: f9e62c1e6a0d3fa24f45a0c3a8ee5110d8639aee https://github.com/galaxyproject/usegalaxy-playbook/commit/f9e62c1e6a0d3fa2… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-07-14 (Fri, 14 Jul 2017) Changed paths: M production/secret_vars/galaxydbservers.yml Log Message: ----------- Update access list

1 0

[galaxyproject/usegalaxy-playbook] dc510d: Update psql user list
by GitHub 13 Jul '17

13 Jul '17

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: dc510da0597fd42462ad3a4197706b47a786fc92 https://github.com/galaxyproject/usegalaxy-playbook/commit/dc510da0597fd424… Author: Enis Afgan <afgane(a)gmail.com> Date: 2017-07-13 (Thu, 13 Jul 2017) Changed paths: M production/group_vars/galaxydbservers.yml Log Message: ----------- Update psql user list

1 0

[galaxyproject/usegalaxy-playbook] 001e21: Swarm GIE fixes
by GitHub 13 Jul '17

13 Jul '17

Branch: refs/heads/reorg Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: 001e2190f319f928f6858f540072bc264d0f849c https://github.com/galaxyproject/usegalaxy-playbook/commit/001e2190f319f928… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2017-07-13 (Thu, 13 Jul 2017) Changed paths: M env/test/group_vars/galaxyservers/vars.yml M roles/usegalaxy_swarmscale/files/inc_spawn.yml M roles/usegalaxy_swarmscale/files/inventory.spawn Log Message: ----------- Swarm GIE fixes

1 0

[galaxyproject/galaxy] 1d53e9: Package locking for node modules.
by GitHub 13 Jul '17

13 Jul '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 1d53e9df146125392a3ae8a7e33365a9fe610d9b https://github.com/galaxyproject/galaxy/commit/1d53e9df146125392a3ae8a7e333… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2017-07-05 (Wed, 05 Jul 2017) Changed paths: A client/package-lock.json Log Message: ----------- Package locking for node modules. Commit: 80b2f1ef3c6c0b4d8c1dcb474ec493e9879bccb8 https://github.com/galaxyproject/galaxy/commit/80b2f1ef3c6c0b4d8c1dcb474ec4… Author: Björn Grüning <bjoern(a)gruenings.eu> Date: 2017-07-13 (Thu, 13 Jul 2017) Changed paths: A client/package-lock.json Log Message: ----------- Merge pull request #4283 from dannon/packagelock Package locking for node modules. Compare: https://github.com/galaxyproject/galaxy/compare/69d0e21c112e...80b2f1ef3c6c

1 0

[galaxyproject/galaxy] 2b36a9: Remove unused dataset selection grid for bookmarks
by GitHub 13 Jul '17

13 Jul '17

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2b36a904df1990aca35b21754391d17711b7f0ee https://github.com/galaxyproject/galaxy/commit/2b36a904df1990aca35b21754391… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-07 (Fri, 07 Jul 2017) Changed paths: M client/galaxy/scripts/viz/trackster.js M static/maps/viz/trackster.js.map M static/scripts/viz/trackster.js Log Message: ----------- Remove unused dataset selection grid for bookmarks Commit: 3493cbbd38e6130772fde53bb163c8673eaca2d1 https://github.com/galaxyproject/galaxy/commit/3493cbbd38e6130772fde53bb163… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-10 (Mon, 10 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M lib/galaxy/webapps/galaxy/controllers/visualization.py M static/maps/viz/visualization.js.map M static/scripts/viz/visualization.js M templates/webapps/galaxy/tracks/add_tracks.mako Log Message: ----------- Replace insertion grid in trackster Commit: ce2c65ff15b196d691a0f406439d45fab314312e https://github.com/galaxyproject/galaxy/commit/ce2c65ff15b196d691a0f406439d… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-10 (Mon, 10 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M static/maps/viz/visualization.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/viz/visualization.js Log Message: ----------- Remove debug statement, repack scripts Commit: 6496aa595a8d20888a1640e41334f968059f7348 https://github.com/galaxyproject/galaxy/commit/6496aa595a8d20888a1640e41334… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-10 (Mon, 10 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M lib/galaxy/webapps/galaxy/controllers/visualization.py M static/maps/viz/visualization.js.map M static/scripts/viz/visualization.js Log Message: ----------- Revise all trackster grids, remove unused grids Commit: 729cc947b3bcad53ba9458968d7d216a096e2e6e https://github.com/galaxyproject/galaxy/commit/729cc947b3bcad53ba9458968d7d… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-10 (Mon, 10 Jul 2017) Changed paths: R templates/webapps/galaxy/tracks/add_tracks.mako Log Message: ----------- Remove add tracks mako Commit: 0214a5523432278460f416e04ed22ff8b5002fb0 https://github.com/galaxyproject/galaxy/commit/0214a5523432278460f416e04ed2… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-10 (Mon, 10 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M lib/galaxy/webapps/galaxy/controllers/visualization.py M static/maps/viz/visualization.js.map M static/scripts/viz/visualization.js Log Message: ----------- Introduce select field for history selection, remove history list grid Commit: 548bc675c5e5e5d4c6b9572f0cf4ef6a75a8adf9 https://github.com/galaxyproject/galaxy/commit/548bc675c5e5e5d4c6b9572f0cf4… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-10 (Mon, 10 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M static/maps/viz/visualization.js.map M static/scripts/viz/visualization.js R templates/webapps/galaxy/tracks/history_datasets_select_grid.mako R templates/webapps/galaxy/tracks/history_select_grid.mako R templates/webapps/galaxy/tracks/library_datasets_select_grid.mako Log Message: ----------- Remove trackster grid makos for library and dataset selection, attempt to refresh grid without rebuild Commit: 02884fa0afc42c694781ea68b4f35a919e85121c https://github.com/galaxyproject/galaxy/commit/02884fa0afc42c694781ea68b4f3… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-10 (Mon, 10 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M static/maps/viz/visualization.js.map M static/scripts/viz/visualization.js Log Message: ----------- Properly refresh grid for new history selection Commit: 2908a8e6c1c5c78a1f05149b8df5fd17245cb4a1 https://github.com/galaxyproject/galaxy/commit/2908a8e6c1c5c78a1f05149b8df5… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-10 (Mon, 10 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M lib/galaxy/webapps/galaxy/controllers/visualization.py M static/maps/viz/visualization.js.map M static/scripts/viz/visualization.js Log Message: ----------- Remove additional div layer Commit: 8f018544efd09ebdd549866c873aa60f620440ed https://github.com/galaxyproject/galaxy/commit/8f018544efd09ebdd549866c873a… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-10 (Mon, 10 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M static/maps/viz/visualization.js.map M static/scripts/viz/visualization.js Log Message: ----------- Add library handler Commit: 8fd5c234b5f95d725786e3151538bfe4bb9fe1b5 https://github.com/galaxyproject/galaxy/commit/8fd5c234b5f95d725786e3151538… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M lib/galaxy/webapps/galaxy/controllers/visualization.py M static/maps/viz/visualization.js.map M static/scripts/viz/visualization.js Log Message: ----------- Restore library dataset support Commit: add6efb7dadfaa03bccb6bc28208f3d891f53e0e https://github.com/galaxyproject/galaxy/commit/add6efb7dadfaa03bccb6bc28208… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M static/maps/viz/visualization.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/viz/visualization.js Log Message: ----------- Fix ldda vs hda detection Commit: 6dbe4d67250a3fa26ede4f4939e9210f5e9e8860 https://github.com/galaxyproject/galaxy/commit/6dbe4d67250a3fa26ede4f4939e9… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M static/maps/viz/visualization.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/viz/visualization.js Log Message: ----------- Fix button order Commit: b1ed39eb4a0190a8c26745afb1f1472239244ba4 https://github.com/galaxyproject/galaxy/commit/b1ed39eb4a0190a8c26745afb1f1… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/data.js M client/galaxy/scripts/viz/trackster.js M lib/galaxy/webapps/galaxy/controllers/visualization.py M static/maps/mvc/dataset/data.js.map M static/maps/viz/trackster.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/dataset/data.js R templates/webapps/galaxy/tracks/add_to_viz.mako Log Message: ----------- Remove add to viz grid mako Commit: fbecde352619f167a3651215a65caf5b57e367f0 https://github.com/galaxyproject/galaxy/commit/fbecde352619f167a3651215a65c… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map Log Message: ----------- Repack scripts Commit: 9b1ec4bea274aa7c438d4d89ffb38027053be6b9 https://github.com/galaxyproject/galaxy/commit/9b1ec4bea274aa7c438d4d89ffb3… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/data.js M static/maps/mvc/dataset/data.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/dataset/data.js Log Message: ----------- Remove duplicate trackster options modal Commit: ccc5fc2837c7dac32184ffaaecf1728c283f63f0 https://github.com/galaxyproject/galaxy/commit/ccc5fc2837c7dac32184ffaaecf1… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M client/galaxy/scripts/viz/trackster.js M static/maps/viz/trackster.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/viz/trackster.js Log Message: ----------- Restore trackster options Commit: efaa6b743735d04ec60bd52180eeb5407810a3dc https://github.com/galaxyproject/galaxy/commit/efaa6b743735d04ec60bd52180ee… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/visualization.py Log Message: ----------- Remove unused grid import Commit: 8fac3b50dabebffa13d87acae08ce2112fb57bba https://github.com/galaxyproject/galaxy/commit/8fac3b50dabebffa13d87acae08c… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/visualization.py Log Message: ----------- Remove previous library grid mako caller Commit: 33887518344e14595b9ef6c8df6efc86aa13773f https://github.com/galaxyproject/galaxy/commit/33887518344e14595b9ef6c8df6e… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-model.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/viz/visualization.js M static/maps/mvc/grid/grid-view.js.map M static/maps/viz/visualization.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/viz/visualization.js Log Message: ----------- Add dbkey filter support Commit: 53a6ea4acc3ae3d3600409a79f1518f7a25cffd0 https://github.com/galaxyproject/galaxy/commit/53a6ea4acc3ae3d3600409a79f15… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M client/galaxy/scripts/layout/scratchbook.js M client/galaxy/scripts/viz/phyloviz.js M config/tool_conf.xml.main M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/objectstore/__init__.py A lib/galaxy/objectstore/pithos.py M static/maps/viz/phyloviz.js.map M static/scripts/viz/phyloviz.js Log Message: ----------- Merge branch 'dev' into grid_trackster_selection Commit: 78ffd4d91534874555d1408a5753f4deeca0213b https://github.com/galaxyproject/galaxy/commit/78ffd4d91534874555d1408a5753… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/visualization.py M static/maps/layout/scratchbook.js.map M static/scripts/layout/scratchbook.js Log Message: ----------- Library selection is not possible Commit: a601e5f78e9fab66b84934c26ef6e5403a4656c2 https://github.com/galaxyproject/galaxy/commit/a601e5f78e9fab66b84934c26ef6… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-model.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/trackster.js M client/galaxy/scripts/viz/trackster/tracks.js M client/galaxy/scripts/viz/visualization.js M lib/galaxy/webapps/galaxy/controllers/visualization.py M static/maps/mvc/grid/grid-model.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/viz/circster.js.map M static/maps/viz/trackster.js.map M static/maps/viz/trackster/tracks.js.map M static/maps/viz/visualization.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/grid/grid-view.js M static/scripts/viz/circster.js M static/scripts/viz/trackster.js M static/scripts/viz/trackster/tracks.js M static/scripts/viz/visualization.js Log Message: ----------- Remove history selector in favor of history sorting feature Commit: f94722ea00476a5f6d7b84f0f3bc88d681dd79ec https://github.com/galaxyproject/galaxy/commit/f94722ea00476a5f6d7b84f0f3bc… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M client/galaxy/scripts/viz/visualization.js M static/maps/viz/visualization.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/viz/visualization.js Log Message: ----------- Fix async url Commit: 56d939e38c6b9f5c43aa6c2672eb0277aafde3ee https://github.com/galaxyproject/galaxy/commit/56d939e38c6b9f5c43aa6c2672eb… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/viz/visualization.js M static/maps/mvc/grid/grid-view.js.map M static/maps/viz/visualization.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/grid/grid-view.js M static/scripts/viz/visualization.js Log Message: ----------- Fix checkbox handling in grid view, related to the select all feature Commit: 4cac1ddfab69d14005c3dfd000a9d70b160a85e7 https://github.com/galaxyproject/galaxy/commit/4cac1ddfab69d14005c3dfd000a9… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/visualization.py Log Message: ----------- Remove blank lines Commit: 4540a94dab2675c0ad09c2ff7d68370688c2dfd4 https://github.com/galaxyproject/galaxy/commit/4540a94dab2675c0ad09c2ff7d68… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/visualization.py Log Message: ----------- Fix header titles Commit: bfcd37013bdf03ab790b0bf45cc4cd3b281367a0 https://github.com/galaxyproject/galaxy/commit/bfcd37013bdf03ab790b0bf45cc4… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/visualization.py Log Message: ----------- Filter track insertion by track type Commit: 6d1e2cf45c30ebc541c324c4bca5cac9df8d1923 https://github.com/galaxyproject/galaxy/commit/6d1e2cf45c30ebc541c324c4bca5… Author: guerler <aysam.guerler(a)gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/nls/ja/locale.js M client/galaxy/scripts/nls/locale.js M config/galaxy.ini.sample M lib/galaxy/model/__init__.py M lib/galaxy/tools/imp_exp/__init__.py M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/nls/ja/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/mvc/dataset/dataset-li-edit.js M static/scripts/nls/ja/locale.js M static/scripts/nls/locale.js Log Message: ----------- Merge branch 'dev' into grid_trackster_selection Commit: 69d0e21c112e784bd1df6f20959a5cc7a5c33e11 https://github.com/galaxyproject/galaxy/commit/69d0e21c112e784bd1df6f20959a… Author: John Chilton <jmchilton(a)gmail.com> Date: 2017-07-13 (Thu, 13 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/data.js M client/galaxy/scripts/mvc/grid/grid-model.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/trackster.js M client/galaxy/scripts/viz/trackster/tracks.js M client/galaxy/scripts/viz/visualization.js M lib/galaxy/webapps/galaxy/controllers/visualization.py M static/maps/mvc/dataset/data.js.map M static/maps/mvc/grid/grid-model.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/viz/circster.js.map M static/maps/viz/trackster.js.map M static/maps/viz/trackster/tracks.js.map M static/maps/viz/visualization.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/dataset/data.js M static/scripts/mvc/grid/grid-view.js M static/scripts/viz/circster.js M static/scripts/viz/trackster.js M static/scripts/viz/trackster/tracks.js M static/scripts/viz/visualization.js R templates/webapps/galaxy/tracks/add_to_viz.mako R templates/webapps/galaxy/tracks/add_tracks.mako R templates/webapps/galaxy/tracks/history_datasets_select_grid.mako R templates/webapps/galaxy/tracks/history_select_grid.mako R templates/webapps/galaxy/tracks/library_datasets_select_grid.mako Log Message: ----------- Merge pull request #4302 from guerler/grid_trackster_selection Trackster selection grids and feature fixes Compare: https://github.com/galaxyproject/galaxy/compare/69c4823f5816...69d0e21c112e

1 0