Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: be97d7e6db1d963c64dceeb06c68440500177ba5 https://github.com/galaxyproject/galaxy/commit/be97d7e6db1d963c64dceeb06c684... Author: guerler aysam.guerler@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M client/galaxy/scripts/layout/scratchbook.js M client/galaxy/scripts/mvc/ui/ui-frames.js M client/galaxy/style/less/frame.less M static/maps/layout/scratchbook.js.map M static/maps/mvc/ui/ui-frames.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/scratchbook.js M static/scripts/mvc/ui/ui-frames.js M static/style/blue/base.css

Log Message: ----------- Replace frame dictionary with regular view

Commit: b9e2983e909cc74509214e864820467a256ea336 https://github.com/galaxyproject/galaxy/commit/b9e2983e909cc74509214e8648204... Author: guerler aysam.guerler@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M client/galaxy/scripts/mvc/ui/ui-frames.js M client/galaxy/style/less/frame.less M static/maps/mvc/ui/ui-frames.js.map M static/scripts/mvc/ui/ui-frames.js

Log Message: ----------- Remove grid lock feature

Commit: 53fa566a54eb8d6be69e769ebd9799a9d392db3f https://github.com/galaxyproject/galaxy/commit/53fa566a54eb8d6be69e769ebd979... Author: guerler aysam.guerler@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M client/galaxy/scripts/mvc/ui/ui-frames.js M static/maps/mvc/ui/ui-frames.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-frames.js M static/style/blue/base.css

Log Message: ----------- Use regular initialization from frame shadow view

Commit: 44bd042624602648d87a24805e94e110102286ed https://github.com/galaxyproject/galaxy/commit/44bd042624602648d87a24805e94e... Author: guerler aysam.guerler@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M client/galaxy/scripts/layout/scratchbook.js M client/galaxy/scripts/mvc/ui/ui-frames.js M client/galaxy/style/less/frame.less M static/maps/layout/scratchbook.js.map M static/maps/mvc/ui/ui-frames.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/scratchbook.js M static/scripts/mvc/ui/ui-frames.js M static/style/blue/base.css

Log Message: ----------- Add support for optional header items/icons

Commit: e16c3f34f39d0705a26081eafc5c321d6aca56c9 https://github.com/galaxyproject/galaxy/commit/e16c3f34f39d0705a26081eafc5c3... Author: guerler aysam.guerler@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M client/galaxy/scripts/mvc/ui/ui-frames.js M static/maps/mvc/ui/ui-frames.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-frames.js

Log Message: ----------- Remove unused class variables, reduce indention

Commit: 64cb97cfc90fc93e550c1b74e1c62a9a0d4e656c https://github.com/galaxyproject/galaxy/commit/64cb97cfc90fc93e550c1b74e1c62... Author: guerler aysam.guerler@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M client/galaxy/scripts/layout/scratchbook.js M client/galaxy/scripts/mvc/ui/ui-frames.js M static/maps/layout/scratchbook.js.map M static/maps/mvc/ui/ui-frames.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/scratchbook.js M static/scripts/mvc/ui/ui-frames.js

Log Message: ----------- Parse view instead of content dom on click

Commit: 617cd2de82caca3f174479d3602bb45236da5175 https://github.com/galaxyproject/galaxy/commit/617cd2de82caca3f174479d3602bb... Author: guerler aysam.guerler@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M client/galaxy/scripts/layout/scratchbook.js M client/galaxy/scripts/mvc/ui/ui-frames.js M client/galaxy/style/less/frame.less M static/maps/layout/scratchbook.js.map M static/maps/mvc/ui/ui-frames.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/scratchbook.js M static/scripts/mvc/ui/ui-frames.js M static/style/blue/base.css

Log Message: ----------- Add event handlers to navigate through history

Commit: a12c1cb45ba3026c2ff6d8cc9d70c622e26718f6 https://github.com/galaxyproject/galaxy/commit/a12c1cb45ba3026c2ff6d8cc9d70c... Author: guerler aysam.guerler@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M client/galaxy/scripts/layout/scratchbook.js M static/maps/layout/scratchbook.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/scratchbook.js

Log Message: ----------- Cache histories individually

Commit: 197f2283f92ed851c8a8254eb6c020b90023188d https://github.com/galaxyproject/galaxy/commit/197f2283f92ed851c8a8254eb6c02... Author: guerler aysam.guerler@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M client/galaxy/scripts/mvc/history/history-model.js M lib/galaxy/jobs/runners/condor.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/managers/histories.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/commands.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/parser/yaml.py A lib/galaxy/tools/verify/__init__.py A lib/galaxy/tools/verify/asserts/__init__.py A lib/galaxy/tools/verify/asserts/tabular.py A lib/galaxy/tools/verify/asserts/text.py A lib/galaxy/tools/verify/asserts/xml.py A lib/galaxy/tools/verify/test_data.py M static/maps/mvc/history/history-model.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/history-model.js M templates/show_params.mako M test/api/test_tools.py M test/api/test_workflows.py R test/base/asserts/__init__.py R test/base/asserts/tabular.py R test/base/asserts/text.py R test/base/asserts/xml.py R test/base/test_data.py M test/base/twilltestcase.py M test/functional/test_toolbox.py A test/functional/tools/composite_output_tests.xml M test/functional/tools/samples_tool_conf.xml M test/functional/tools/simple_constructs.yml M test/shed_functional/base/twilltestcase.py M test/unit/managers/test_HistoryManager.py M tools/stats/gsummary.xml

Log Message: ----------- Merge branch 'dev' into scratchbook_slider_000

Commit: 27b70ca9849b241c93958c4b18af38ec576cbd3e https://github.com/galaxyproject/galaxy/commit/27b70ca9849b241c93958c4b18af3... Author: Björn Grüning bjoern@gruenings.eu Date: 2016-05-26 (Thu, 26 May 2016)

Changed paths: M client/galaxy/scripts/layout/scratchbook.js M client/galaxy/scripts/mvc/ui/ui-frames.js M client/galaxy/style/less/frame.less M static/maps/layout/scratchbook.js.map M static/maps/mvc/ui/ui-frames.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/scratchbook.js M static/scripts/mvc/ui/ui-frames.js M static/style/blue/base.css

Log Message: ----------- Merge pull request #2396 from guerler/scratchbook_slider_000

Add history navigation options for dataset frames to scratch book

Compare: https://github.com/galaxyproject/galaxy/compare/50359e1633b5...27b70ca9849b