Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3258635c159acfa3cd4ab33e1484b20b9bced9c1 https://github.com/galaxyproject/galaxy/commit/3258635c159acfa3cd4ab33e1484b... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M client/galaxy/scripts/apps/analysis.js
Log Message: ----------- Add histories route to analaysis app
Commit: 0fa6f144d013ecac7bcd268f100b07c2c7811ffe https://github.com/galaxyproject/galaxy/commit/0fa6f144d013ecac7bcd268f100b0... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M client/galaxy/scripts/layout/menu.js M static/maps/layout/menu.js.map M static/scripts/layout/menu.js
Log Message: ----------- Redirect masthead link
Commit: 15206d1dec8547b0ee23a5f8412478f79a6689e0 https://github.com/galaxyproject/galaxy/commit/15206d1dec8547b0ee23a5f841247... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py
Log Message: ----------- Add client route to backend app
Commit: 6af0126e60fcffc8afa3d57c8a1d9490822bdfa4 https://github.com/galaxyproject/galaxy/commit/6af0126e60fcffc8afa3d57c8a1d9... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py
Log Message: ----------- Change controller response from mako to json
Commit: 658483ba5e50516d3bbef8f22411534a483a1aa6 https://github.com/galaxyproject/galaxy/commit/658483ba5e50516d3bbef8f224115... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py 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: ----------- Fix refresh handler
Commit: 23d086a9894d6ea67bf19ca0f74147f62e76c801 https://github.com/galaxyproject/galaxy/commit/23d086a9894d6ea67bf19ca0f7414... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py
Log Message: ----------- Fix sharing operation
Commit: d7d33323952d81352259bc745d749b8583a3cd16 https://github.com/galaxyproject/galaxy/commit/d7d33323952d81352259bc745d749... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py
Log Message: ----------- Remove custom mako name from definition
Commit: 9ed0326b150e71b781994c4d2def42f71fdb48d0 https://github.com/galaxyproject/galaxy/commit/9ed0326b150e71b781994c4d2def4... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py
Log Message: ----------- Fix rename operation
Commit: c987e5fa375ce66f383482a7b30c23e71610d2a2 https://github.com/galaxyproject/galaxy/commit/c987e5fa375ce66f383482a7b30c2... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py
Log Message: ----------- Revise view operation
Commit: 843ed9e6a9d2f7545919b71b057068ffb52f4d01 https://github.com/galaxyproject/galaxy/commit/843ed9e6a9d2f7545919b71b05706... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 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: ----------- Pack
Commit: 49ae97d3a368d1352f591a8d5a6bde96307af27d https://github.com/galaxyproject/galaxy/commit/49ae97d3a368d1352f591a8d5a6bd... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py
Log Message: ----------- Remove uncommented copy statement
Commit: 0fb1059bf74bbd4ba7f12cdd0f1104141242290b https://github.com/galaxyproject/galaxy/commit/0fb1059bf74bbd4ba7f12cdd0f110... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M client/galaxy/scripts/apps/analysis.js 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 R templates/webapps/galaxy/history/grid.mako R templates/webapps/galaxy/history/grid_js.mako
Log Message: ----------- Insert custom history-list view to accomodate copy dialog hack
Commit: 01cab673e7dcca0e7d463e3aa4982e49fa632e27 https://github.com/galaxyproject/galaxy/commit/01cab673e7dcca0e7d463e3aa4982... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: A static/maps/mvc/history/history-list.js.map A static/scripts/mvc/history/history-list.js
Log Message: ----------- Add packed files
Commit: e3a4bf5d9ed02fe22a6732637511490d0a086f8d https://github.com/galaxyproject/galaxy/commit/e3a4bf5d9ed02fe22a67326375114... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: A client/galaxy/scripts/mvc/history/history-list.js
Log Message: ----------- Add history list module
Commit: 84adc659bc67b6b65206ad7f9e9ee10916237f30 https://github.com/galaxyproject/galaxy/commit/84adc659bc67b6b65206ad7f9e9ee... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/history/history-list.js M static/maps/mvc/grid/grid-view.js.map M static/maps/mvc/history/history-list.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/mvc/history/history-list.js
Log Message: ----------- Augment grid view event handler to allow custom client side operations
Commit: d931df2ca9d107d07af1c97a3d5de326f8ef378b https://github.com/galaxyproject/galaxy/commit/d931df2ca9d107d07af1c97a3d5de... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M client/galaxy/scripts/mvc/history/history-list.js M static/maps/mvc/history/history-list.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/mvc/history/history-list.js
Log Message: ----------- Reimplement copy operation
Commit: c3305581426fc2b344499079a5f94a65c9f5400a https://github.com/galaxyproject/galaxy/commit/c3305581426fc2b344499079a5f94... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M client/galaxy/scripts/mvc/history/options-menu.js M static/maps/mvc/history/options-menu.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/history/options-menu.js
Log Message: ----------- Reroute link form history panel to saved grids
Commit: 72d038504128a5b8e7ce721375b254b18805c450 https://github.com/galaxyproject/galaxy/commit/72d038504128a5b8e7ce721375b25... Author: guerler aysam.guerler@gmail.com Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths: M client/galaxy/scripts/mvc/history/options-menu.js M static/maps/mvc/history/options-menu.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/history/options-menu.js
Log Message: ----------- Fix target handling
Commit: b9461eba40fbc3e8d3129fff94b954f2618c5ddf https://github.com/galaxyproject/galaxy/commit/b9461eba40fbc3e8d3129fff94b95... Author: guerler aysam.guerler@gmail.com Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/grid/grid-view.js A client/galaxy/scripts/mvc/page/page-list.js M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M config/job_conf.xml.sample_advanced M lib/galaxy/config.py M lib/galaxy/datatypes/data.py A lib/galaxy/datatypes/plant_tribes.py M lib/galaxy/datatypes/text.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/docker_util.py M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_channel.py M lib/galaxy/tools/deps/mulled/mulled_build_files.py M lib/galaxy/tools/deps/mulled/mulled_search.py M lib/galaxy/tools/deps/mulled/util.py A lib/galaxy/tools/deps/singularity_util.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/page.py M static/maps/layout/menu.js.map M static/maps/mvc/grid/grid-view.js.map A static/maps/mvc/page/page-list.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 M static/scripts/mvc/grid/grid-view.js A static/scripts/mvc/page/page-list.js M templates/sharing_base.mako R templates/webapps/galaxy/dataset/grid.mako M templates/webapps/galaxy/page/editor.mako R templates/webapps/galaxy/page/index.mako A test/functional/tools/mulled_example_multi_versionless.xml M test/functional/tools/samples_tool_conf.xml
Log Message: ----------- Merge branch 'dev' into grid_histories
Commit: c2ebb5776bc26d62179fbc7ffe07bb7bec4288cf https://github.com/galaxyproject/galaxy/commit/c2ebb5776bc26d62179fbc7ffe07b... Author: guerler aysam.guerler@gmail.com Date: 2017-06-14 (Wed, 14 Jun 2017)
Changed paths: M client/galaxy/scripts/apps/analysis.js M lib/galaxy/webapps/galaxy/buildapp.py 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 explicit routes
Commit: 434d944e5da46cf889b74a6759f3cce88c2f6aa4 https://github.com/galaxyproject/galaxy/commit/434d944e5da46cf889b74a6759f3c... Author: guerler aysam.guerler@gmail.com Date: 2017-06-14 (Wed, 14 Jun 2017)
Changed paths: M .gitignore M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/webhooks.js M client/galaxy/scripts/onload.js M config/plugins/webhooks/demo/tool_list/helper/__init__.py A config/plugins/webhooks/demo/tour_generator/config/tour_generator.yml A config/plugins/webhooks/demo/tour_generator/helper/__init__.py A config/plugins/webhooks/demo/tour_generator/static/script.js A config/plugins/webhooks/demo/tour_generator/static/styles.css M cron/updateucsc.sh.sample M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/mulled/invfile.lua M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_files.py M lib/galaxy/tools/deps/mulled/mulled_build_tool.py M lib/galaxy/webapps/galaxy/api/webhooks.py M static/maps/layout/menu.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/maps/mvc/tool/tool-form.js.map M static/maps/mvc/webhooks.js.map M static/maps/onload.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 M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/webhooks.js M static/scripts/onload.js M templates/js-app.mako M test/functional/webhooks/phdcomics/helper/__init__.py M test/functional/webhooks/trans_object/helper/__init__.py
Log Message: ----------- Merge branch 'dev' into grid_histories
Commit: 6a0401e08ebce9797901812c57d7fca69a887c0b https://github.com/galaxyproject/galaxy/commit/6a0401e08ebce9797901812c57d7f... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-06-20 (Tue, 20 Jun 2017)
Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/grid/grid-view.js A client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/history/options-menu.js M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/history.py M static/maps/layout/menu.js.map M static/maps/mvc/grid/grid-view.js.map A static/maps/mvc/history/history-list.js.map M static/maps/mvc/history/options-menu.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.map M static/scripts/layout/menu.js M static/scripts/mvc/grid/grid-view.js A static/scripts/mvc/history/history-list.js M static/scripts/mvc/history/options-menu.js R templates/webapps/galaxy/history/grid.mako R templates/webapps/galaxy/history/grid_js.mako
Log Message: ----------- Merge pull request #4167 from guerler/grid_histories
Remove histories grid mako
Compare: https://github.com/galaxyproject/galaxy/compare/89851e4c7154...6a0401e08ebc