Branch: refs/heads/release_15.10 Home: https://github.com/galaxyproject/galaxy Commit: ed992b3b28c7f6d9d637e82e88305b665733a50b https://github.com/galaxyproject/galaxy/commit/ed992b3b28c7f6d9d637e82e88305... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-11-19 (Thu, 19 Nov 2015) Changed paths: M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/collection/pair-collection-creator.js M client/galaxy/scripts/mvc/dataset/dataset-choice.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/history-panel.js M client/galaxy/scripts/mvc/history/multi-panel.js M client/galaxy/scripts/mvc/job/job-li.js M client/galaxy/scripts/mvc/list/list-panel.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/toolshed/scripts/mvc/groups/group-detail-view.js M client/toolshed/scripts/mvc/groups/group-listrow-view.js M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/external_service.py M lib/galaxy/webapps/galaxy/controllers/forms.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/library.py M lib/galaxy/webapps/galaxy/controllers/library_admin.py M lib/galaxy/webapps/galaxy/controllers/request_type.py M lib/galaxy/webapps/galaxy/controllers/requests_admin.py M lib/galaxy/webapps/galaxy/controllers/requests_common.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/reports/controllers/jobs.py M lib/galaxy/webapps/reports/controllers/sample_tracking.py M lib/galaxy/webapps/reports/controllers/workflows.py M lib/tool_shed/grids/admin_grids.py M lib/tool_shed/grids/repository_grids.py M lib/tool_shed/grids/repository_review_grids.py M static/maps/mvc/history/multi-panel.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/scripts/libs/jquery/jquery.dynatree.js M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/scripts/mvc/collection/pair-collection-creator.js M static/scripts/mvc/dataset/dataset-choice.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/dataset/dataset-li.js M static/scripts/mvc/history/history-panel.js M static/scripts/mvc/history/multi-panel.js M static/scripts/mvc/job/job-li.js M static/scripts/mvc/list/list-panel.js M static/scripts/mvc/ui/ui-select-default.js Log Message: ----------- A large assortment of escaping fixes to primarily grids and javascript templating, and one bad-data-ingress fix (copy history name). Commit: 90bed00ebe8a5b4a7e0aeb61c23c991daae03fb8 https://github.com/galaxyproject/galaxy/commit/90bed00ebe8a5b4a7e0aeb61c23c9... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-08 (Fri, 08 Jan 2016) Log Message: ----------- Merge 15.07 into 15.10. Merge remote-tracking branch 'jmchilton/release_15.07' into release_15.10 Conflicts: client/galaxy/scripts/mvc/history/multi-panel.js lib/galaxy/webapps/galaxy/controllers/external_service.py lib/galaxy/webapps/galaxy/controllers/forms.py lib/galaxy/webapps/galaxy/controllers/library_admin.py lib/galaxy/webapps/galaxy/controllers/request_type.py lib/galaxy/webapps/galaxy/controllers/requests_admin.py lib/galaxy/webapps/galaxy/controllers/requests_common.py lib/galaxy/webapps/galaxy/controllers/visualization.py lib/galaxy/webapps/reports/controllers/jobs.py lib/galaxy/webapps/reports/controllers/sample_tracking.py lib/galaxy/webapps/reports/controllers/workflows.py lib/tool_shed/grids/admin_grids.py lib/tool_shed/grids/repository_grids.py lib/tool_shed/grids/repository_review_grids.py static/maps/mvc/history/multi-panel.js.map static/maps/mvc/ui/ui-select-default.js.map static/scripts/mvc/collection/list-collection-creator.js static/scripts/mvc/collection/list-of-pairs-collection-creator.js static/scripts/mvc/dataset/dataset-li-edit.js static/scripts/mvc/dataset/dataset-li.js static/scripts/mvc/history/history-panel.js static/scripts/mvc/history/multi-panel.js static/scripts/mvc/list/list-panel.js static/scripts/mvc/ui/ui-select-default.js Commit: c13b1c088cfbb0c708b2ce1d9068c704aba6cc95 https://github.com/galaxyproject/galaxy/commit/c13b1c088cfbb0c708b2ce1d9068c... Author: John Chilton <jmchilton@gmail.com> Date: 2016-01-08 (Fri, 08 Jan 2016) Log Message: ----------- Merge pull request #1458 from jmchilton/release_15.10_merge_0 [15.10] Merge 15.07 into 15.10. Compare: https://github.com/galaxyproject/galaxy/compare/7b45f7b40473...c13b1c088cfb