Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 8420d89a55f0e4dafb2711631b6c556a08e3cabc https://github.com/galaxyproject/galaxy/commit/8420d89a55f0e4dafb2711631b6c5... Author: guerler aysam.guerler@gmail.com Date: 2017-09-27 (Wed, 27 Sep 2017)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/root.py M templates/webapps/galaxy/history/permissions.mako

Log Message: ----------- Move history default permissions to history controller

Commit: 49ebf1261da97858b89c307cb7227c847fcc3125 https://github.com/galaxyproject/galaxy/commit/49ebf1261da97858b89c307cb7227... Author: guerler aysam.guerler@gmail.com Date: 2017-09-27 (Wed, 27 Sep 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.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/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map

Log Message: ----------- Add client routes, link from history panel to controller endpoint for history permissions

Commit: 1c3e5f2106e2315824dec04e20179117bb634f58 https://github.com/galaxyproject/galaxy/commit/1c3e5f2106e2315824dec04e20179... Author: guerler aysam.guerler@gmail.com Date: 2017-09-27 (Wed, 27 Sep 2017)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py

Log Message: ----------- Build preliminary form structure

Commit: 5f61ec3d4fc1dd55f89b1e730074684a20f05103 https://github.com/galaxyproject/galaxy/commit/5f61ec3d4fc1dd55f89b1e7300746... Author: guerler aysam.guerler@gmail.com Date: 2017-09-27 (Wed, 27 Sep 2017)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py

Log Message: ----------- Add save to history permissions endpoint

Commit: 5d3fc7af61614085ceeed3f561875bcddbba8cc0 https://github.com/galaxyproject/galaxy/commit/5d3fc7af61614085ceeed3f561875... Author: guerler aysam.guerler@gmail.com Date: 2017-09-27 (Wed, 27 Sep 2017)

Changed paths: R templates/webapps/galaxy/history/permissions.mako

Log Message: ----------- Remove history permissions mako

Commit: 361c0dc2ece875ed46b4edc7095e0b1f20802cd6 https://github.com/galaxyproject/galaxy/commit/361c0dc2ece875ed46b4edc7095e0... Author: guerler aysam.guerler@gmail.com Date: 2017-09-27 (Wed, 27 Sep 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.js M lib/galaxy/webapps/galaxy/controllers/history.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: ----------- Allow history dataset permissions modifications in saved histories grid

Commit: b08a81c4059df2bc11773d1fe3328f55631e784d https://github.com/galaxyproject/galaxy/commit/b08a81c4059df2bc11773d1fe3328... Author: guerler aysam.guerler@gmail.com Date: 2017-09-27 (Wed, 27 Sep 2017)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py

Log Message: ----------- Preserve previous drop down order

Commit: 7f57010a431aa416dd5574bcdfd6ec9cee9afa1b https://github.com/galaxyproject/galaxy/commit/7f57010a431aa416dd5574bcdfd6e... Author: guerler aysam.guerler@gmail.com Date: 2017-09-27 (Wed, 27 Sep 2017)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/root.py

Log Message: ----------- Fix spacing

Commit: d61db29f29f99598577467a90690ce3deef09844 https://github.com/galaxyproject/galaxy/commit/d61db29f29f99598577467a90690c... Author: guerler aysam.guerler@gmail.com Date: 2017-09-27 (Wed, 27 Sep 2017)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py

Log Message: ----------- Disable multi operation for dataset permissions view

Commit: f88ce0b3825c277c181c19c2ff562812a826dd4a https://github.com/galaxyproject/galaxy/commit/f88ce0b3825c277c181c19c2ff562... Author: guerler aysam.guerler@gmail.com Date: 2017-09-28 (Thu, 28 Sep 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/galaxy.interactive_environments.js M client/galaxy/scripts/mvc/workflow/workflow-model.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/onload.js M client/toolshed/scripts/mvc/groups/group-model.js M config/plugins/interactive_environments/common/templates/ie.mako M config/plugins/interactive_environments/jupyter/static/js/jupyter.js M config/plugins/interactive_environments/jupyter/templates/jupyter.mako M lib/galaxy/jobs/runners/util/job_script/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/web/framework/webapp.py M static/maps/galaxy.interactive_environments.js.map M static/maps/mvc/workflow/workflow-model.js.map M static/maps/mvc/workflow/workflow.js.map M static/maps/onload.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/galaxy.interactive_environments.js M static/scripts/mvc/workflow/workflow-model.js M static/scripts/mvc/workflow/workflow.js M static/scripts/onload.js M static/toolshed/maps/mvc/groups/group-detail-view.js.map M static/toolshed/maps/mvc/groups/group-list-view.js.map M static/toolshed/maps/mvc/groups/group-listrow-view.js.map M static/toolshed/maps/mvc/groups/group-model.js.map M static/toolshed/scripts/mvc/groups/group-detail-view.js M static/toolshed/scripts/mvc/groups/group-list-view.js M static/toolshed/scripts/mvc/groups/group-listrow-view.js M static/toolshed/scripts/mvc/groups/group-model.js

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

Commit: a5c83b3ce95c46a58c05d4f9a6d50d9687048c9c https://github.com/galaxyproject/galaxy/commit/a5c83b3ce95c46a58c05d4f9a6d50... Author: guerler aysam.guerler@gmail.com Date: 2017-09-28 (Thu, 28 Sep 2017)

Changed paths: M client/galaxy/scripts/mvc/history/options-menu.js 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 same push url format as in other push requests

Commit: dd4d077a8197649d9f35974e873c67aebf5fdda4 https://github.com/galaxyproject/galaxy/commit/dd4d077a8197649d9f35974e873c6... Author: guerler aysam.guerler@gmail.com Date: 2017-09-29 (Fri, 29 Sep 2017)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py

Log Message: ----------- Fix error message

Commit: f97392c1db4ebd0b0d1436f6271fc6727526be33 https://github.com/galaxyproject/galaxy/commit/f97392c1db4ebd0b0d1436f6271fc... Author: guerler aysam.guerler@gmail.com Date: 2017-09-29 (Fri, 29 Sep 2017)

Changed paths: M .ci/flake8_lint_include_list.txt M client/galaxy/scripts/onload.js M doc/source/admin/reports.md M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/dependencies/requirements.txt A lib/galaxy/managers/jobs.py M lib/galaxy/model/mapping.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/util/__init__.py M lib/galaxy/webapps/galaxy/api/jobs.py M static/maps/onload.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/onload.js M test/api/test_jobs.py

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

Commit: 73bb4ba8c2e5e21dce0aa90dcb96394083840e70 https://github.com/galaxyproject/galaxy/commit/73bb4ba8c2e5e21dce0aa90dcb963... Author: John Chilton jmchilton@gmail.com Date: 2017-09-29 (Fri, 29 Sep 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.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 lib/galaxy/webapps/galaxy/controllers/root.py M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map R templates/webapps/galaxy/history/permissions.mako

Log Message: ----------- Merge pull request #4711 from guerler/replace_history_permission_form

Removes the history permissions form mako

Compare: https://github.com/galaxyproject/galaxy/compare/e5597639e2f9...73bb4ba8c2e5