Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2b36a904df1990aca35b21754391d17711b7f0ee https://github.com/galaxyproject/galaxy/commit/2b36a904df1990aca35b21754391d... Author: guerler <aysam.guerler@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/3493cbbd38e6130772fde53bb163c... Author: guerler <aysam.guerler@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/ce2c65ff15b196d691a0f406439d4... Author: guerler <aysam.guerler@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/6496aa595a8d20888a1640e41334f... Author: guerler <aysam.guerler@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/729cc947b3bcad53ba9458968d7d2... Author: guerler <aysam.guerler@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/0214a5523432278460f416e04ed22... Author: guerler <aysam.guerler@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/548bc675c5e5e5d4c6b9572f0cf4e... Author: guerler <aysam.guerler@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/02884fa0afc42c694781ea68b4f35... Author: guerler <aysam.guerler@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/2908a8e6c1c5c78a1f05149b8df5f... Author: guerler <aysam.guerler@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/8f018544efd09ebdd549866c873aa... Author: guerler <aysam.guerler@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/8fd5c234b5f95d725786e3151538b... Author: guerler <aysam.guerler@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/add6efb7dadfaa03bccb6bc28208f... Author: guerler <aysam.guerler@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/6dbe4d67250a3fa26ede4f4939e92... Author: guerler <aysam.guerler@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/b1ed39eb4a0190a8c26745afb1f14... Author: guerler <aysam.guerler@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/fbecde352619f167a3651215a65ca... Author: guerler <aysam.guerler@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/9b1ec4bea274aa7c438d4d89ffb38... Author: guerler <aysam.guerler@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/ccc5fc2837c7dac32184ffaaecf17... Author: guerler <aysam.guerler@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/efaa6b743735d04ec60bd52180eeb... Author: guerler <aysam.guerler@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/8fac3b50dabebffa13d87acae08ce... Author: guerler <aysam.guerler@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/33887518344e14595b9ef6c8df6ef... Author: guerler <aysam.guerler@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/53a6ea4acc3ae3d3600409a79f151... Author: guerler <aysam.guerler@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/78ffd4d91534874555d1408a5753f... Author: guerler <aysam.guerler@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/a601e5f78e9fab66b84934c26ef6e... Author: guerler <aysam.guerler@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/f94722ea00476a5f6d7b84f0f3bc8... Author: guerler <aysam.guerler@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/56d939e38c6b9f5c43aa6c2672eb0... Author: guerler <aysam.guerler@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/4cac1ddfab69d14005c3dfd000a9d... Author: guerler <aysam.guerler@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/4540a94dab2675c0ad09c2ff7d683... Author: guerler <aysam.guerler@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/bfcd37013bdf03ab790b0bf45cc4c... Author: guerler <aysam.guerler@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/6d1e2cf45c30ebc541c324c4bca5c... Author: guerler <aysam.guerler@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/69d0e21c112e784bd1df6f20959a5... Author: John Chilton <jmchilton@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