Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 37a6c488b0cb99450e2781656eee2462bf539900 https://github.com/galaxyproject/galaxy/commit/37a6c488b0cb99450e2781656eee2... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-29 (Sat, 29 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Remove unused template Commit: 4ccb3e3874e0548289d746fee03a96250df9f1e3 https://github.com/galaxyproject/galaxy/commit/4ccb3e3874e0548289d746fee03a9... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-29 (Sat, 29 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Return roles grid as dictionary Commit: 6c91bc287ef0846869f1604d2ebfd684fb550df4 https://github.com/galaxyproject/galaxy/commit/6c91bc287ef0846869f1604d2ebfd... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-29 (Sat, 29 Jul 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.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: ----------- Add client side routes Commit: b8396a961facd7dada8d8db837386b656855c3b1 https://github.com/galaxyproject/galaxy/commit/b8396a961facd7dada8d8db837386... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-30 (Sun, 30 Jul 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M lib/galaxy/webapps/galaxy/controllers/admin.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: ----------- Add admin role editing options Commit: 00432345ff20bbcf5023995b6cfb54937eb4be9e https://github.com/galaxyproject/galaxy/commit/00432345ff20bbcf5023995b6cfb5... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-31 (Mon, 31 Jul 2017) Changed paths: M lib/tool_shed/util/admin_util.py M templates/admin/user/reset_password.mako M templates/admin/user/user.mako Log Message: ----------- Merge branch 'revise_page' into admin_grid_roles Commit: d7717cfa8b8562d82742ba285d54e7d7ab794d2d https://github.com/galaxyproject/galaxy/commit/d7717cfa8b8562d82742ba285d54e... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-31 (Mon, 31 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Remove unused galaxy role grid operations Commit: 8ee4c29a0579b2a9156f0cd4a70139758ed58b60 https://github.com/galaxyproject/galaxy/commit/8ee4c29a0579b2a9156f0cd4a7013... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-01 (Tue, 01 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/galaxy.js M client/galaxy/scripts/layout/router.js A client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/nls/fr/locale.js M config/tool_shed.ini.sample M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/runners/cli.py M lib/galaxy/model/mapping.py M lib/galaxy/model/metadata.py M lib/galaxy/security/__init__.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/quotas.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/workflow/modules.py M static/maps/galaxy.js.map M static/maps/layout/router.js.map A static/maps/mvc/dataset/dataset-edit-attributes.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/nls/fr/locale.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/galaxy.js M static/scripts/layout/router.js A static/scripts/mvc/dataset/dataset-edit-attributes.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/grid/grid-view.js M static/scripts/nls/fr/locale.js R templates/webapps/galaxy/dataset/edit_attributes.mako Log Message: ----------- Merge branch 'revise_page' into admin_grid_roles Commit: f76f9515a3b243bfb510f89aaa50e95a4990465f https://github.com/galaxyproject/galaxy/commit/f76f9515a3b243bfb510f89aaa50e... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-01 (Tue, 01 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Parse url parameters for message handling Commit: e32661301cef0815fdd36743d1ab9901d2576ef2 https://github.com/galaxyproject/galaxy/commit/e32661301cef0815fdd36743d1ab9... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-02 (Wed, 02 Aug 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/user/user-preferences.js R client/galaxy/scripts/mvc/workflow/workflow-configure-menu.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/style/less/base.less M config/plugins/webhooks/demo/search/static/script.js M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/workflow/workflow.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/user/user-preferences.js M static/scripts/mvc/workflow/workflow.js M static/style/blue/base.css Log Message: ----------- Merge branch 'dev' into admin_grid_roles Commit: 77608ac4105ee90e3323d74e2273618fd2d06ca7 https://github.com/galaxyproject/galaxy/commit/77608ac4105ee90e3323d74e22736... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/form/form-view.js A client/galaxy/scripts/mvc/form/form-wrapper.js M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/utils/query-string-parsing.js M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/managers/tags.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/tool_shed/grids/admin_grids.py M lib/tool_shed/util/admin_util.py M static/maps/layout/menu.js.map M static/maps/mvc/form/form-view.js.map A static/maps/mvc/form/form-wrapper.js.map M static/maps/mvc/grid/grid-template.js.map M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/workflow/workflow-forms.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/maps/utils/query-string-parsing.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/layout/menu.js M static/scripts/mvc/form/form-view.js A static/scripts/mvc/form/form-wrapper.js M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/user/user-preferences.js M static/scripts/mvc/workflow/workflow-forms.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/utils/query-string-parsing.js R templates/admin/dataset_security/group/grid.mako R templates/admin/dataset_security/role/grid.mako R templates/admin/quota/grid.mako R templates/admin/tool_version/grid.mako R templates/admin/user/grid.mako R templates/admin/user/reset_password.mako R templates/admin/user/user.mako A templates/webapps/tool_shed/admin/user/reset_password.mako A templates/webapps/tool_shed/admin/user/user.mako R templates/webapps/tool_shed/repository/grid.mako Log Message: ----------- Merge branch 'revise_grid_forms' into admin_grid_roles Commit: b46f4e4c84f042a3b668020d6767b6777e2babb4 https://github.com/galaxyproject/galaxy/commit/b46f4e4c84f042a3b668020d6767b... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/apps/analysis.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: ----------- Remove unused routing message handler Commit: 44a339546b1849131b9c9f993aee332171217709 https://github.com/galaxyproject/galaxy/commit/44a339546b1849131b9c9f993aee3... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Fix menu link Commit: ffe3ac294d8a21a10546f45518e4d2c52e1bc966 https://github.com/galaxyproject/galaxy/commit/ffe3ac294d8a21a10546f45518e4d... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Do not parse empty messages Commit: 246e94ae8470e1ef78f1b136bcdc117f45e036ef https://github.com/galaxyproject/galaxy/commit/246e94ae8470e1ef78f1b136bcdc1... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M lib/galaxy/webapps/galaxy/controllers/admin.py M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Build role renaming in client Commit: 20ce574e3304af6cb09d98b9d8e17a7ff7c3c628 https://github.com/galaxyproject/galaxy/commit/20ce574e3304af6cb09d98b9d8e17... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Add role renaming feature to revised endpoint Commit: 99bf6809bebb621a33050164f2c7e2a2f203ae40 https://github.com/galaxyproject/galaxy/commit/99bf6809bebb621a33050164f2c7e... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Repack scripts Commit: 5ab9ea4ffdb7c5359d32a0653f6ac59d9fc37d21 https://github.com/galaxyproject/galaxy/commit/5ab9ea4ffdb7c5359d32a0653f6ac... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-wrapper.js M static/maps/mvc/form/form-wrapper.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/form/form-wrapper.js Log Message: ----------- Use primary button Commit: 4d542820e70d02c0809d3bd8482746b90e68642d https://github.com/galaxyproject/galaxy/commit/4d542820e70d02c0809d3bd848274... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-wrapper.js M lib/galaxy/webapps/galaxy/api/users.py M static/maps/mvc/form/form-wrapper.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/form/form-wrapper.js Log Message: ----------- Remove unused messages, set default message status Commit: 502b2a068c06e190484fda2adcdc43ffef7d07e2 https://github.com/galaxyproject/galaxy/commit/502b2a068c06e190484fda2adcdc4... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/mvc/form/form-wrapper.js M client/galaxy/scripts/mvc/user/user-preferences.js M static/maps/mvc/form/form-wrapper.js.map M static/maps/mvc/user/user-preferences.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/form/form-wrapper.js M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Use redirect option for user preferences Commit: b908e98e37de20aff2b18acd6b93b79b9020f4a8 https://github.com/galaxyproject/galaxy/commit/b908e98e37de20aff2b18acd6b93b... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-repeat.js M client/galaxy/scripts/mvc/form/form-wrapper.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/ui/ui-buttons.js M client/galaxy/style/less/ui.less M static/maps/mvc/form/form-repeat.js.map M static/maps/mvc/form/form-wrapper.js.map M static/maps/mvc/tool/tool-form.js.map M static/maps/mvc/ui/ui-buttons.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/form/form-repeat.js M static/scripts/mvc/form/form-wrapper.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/ui/ui-buttons.js M static/style/blue/base.css Log Message: ----------- Fix button and operations floating handling Commit: bf6e2d26bd128e773ae3c604216e7b939abf8c01 https://github.com/galaxyproject/galaxy/commit/bf6e2d26bd128e773ae3c604216e7... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/user/user-custom-builds.js M static/maps/mvc/user/user-custom-builds.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/user/user-custom-builds.js Log Message: ----------- Fix floating for custom build form button Commit: afa6964994fb6aa6acad44d03f4123f2f7726839 https://github.com/galaxyproject/galaxy/commit/afa6964994fb6aa6acad44d03f412... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-list.js M client/galaxy/style/less/ui.less M static/maps/mvc/ui/ui-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.map M static/scripts/mvc/ui/ui-list.js M static/style/blue/base.css Log Message: ----------- Fix style for list parameter Commit: d11fc568a41a3dba540457f9d861182acfbae117 https://github.com/galaxyproject/galaxy/commit/d11fc568a41a3dba540457f9d8611... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-04 (Fri, 04 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M lib/tool_shed/grids/repository_grids.py R templates/admin/tool_shed_repository/grid.mako Log Message: ----------- Merge branch 'revise_grid_forms' into admin_grid_roles Commit: 9d8bdc6f304d676157f8c0e5a76f6c49dd9e5d4b https://github.com/galaxyproject/galaxy/commit/9d8bdc6f304d676157f8c0e5a76f6... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-05 (Sat, 05 Aug 2017) Changed paths: M lib/galaxy/web/base/controller.py M static/maps/galaxy.js.map M static/scripts/galaxy.js Log Message: ----------- Repack scripts Commit: 1675b9cca2cc1c5aa8a4e495e23c0877a781cf39 https://github.com/galaxyproject/galaxy/commit/1675b9cca2cc1c5aa8a4e495e23c0... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-05 (Sat, 05 Aug 2017) Changed paths: M client/galaxy/scripts/galaxy.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/user/user-preferences.js M lib/galaxy/jobs/rule_helper.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/user.py M static/maps/galaxy.js.map M static/maps/layout/menu.js.map M static/maps/mvc/user/user-preferences.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.js M static/scripts/layout/menu.js M static/scripts/mvc/user/user-preferences.js M templates/galaxy_client_app.mako M templates/user/login.mako M templates/user/register.mako M templates/webapps/galaxy/history/display_structured.mako M templates/webapps/galaxy/workflow/build_from_current_history.mako M test/shed_functional/base/twilltestcase.py Log Message: ----------- Merge branch 'revise_grid_forms' into admin_grid_roles Commit: d698d32ceb043fdb9820b68615748ca13e0825c8 https://github.com/galaxyproject/galaxy/commit/d698d32ceb043fdb9820b68615748... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M lib/galaxy/webapps/galaxy/controllers/admin.py M static/maps/mvc/user/user-preferences.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Manage users and groups for role Commit: 9ee062bd4622481165d4cb1e783454a49fcdd704 https://github.com/galaxyproject/galaxy/commit/9ee062bd4622481165d4cb1e78345... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Show current name and description when renaming roles Commit: 183176a05c95e063a710ff469a368c463e18db2f https://github.com/galaxyproject/galaxy/commit/183176a05c95e063a710ff469a368... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M lib/galaxy/webapps/galaxy/controllers/admin.py M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Add create role form Commit: 663c6c13975b01cf0472a083a68164d9bd010871 https://github.com/galaxyproject/galaxy/commit/663c6c13975b01cf0472a083a6816... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py R templates/admin/dataset_security/role/role.mako R templates/admin/dataset_security/role/role_create.mako R templates/admin/dataset_security/role/role_rename.mako A templates/webapps/tool_shed/admin/dataset_security/role/role.mako A templates/webapps/tool_shed/admin/dataset_security/role/role_create.mako A templates/webapps/tool_shed/admin/dataset_security/role/role_rename.mako Log Message: ----------- Fix boolean title, and move unused role makos to toolshed Commit: e77fd47b034e6af5b19756bd778f5081332e7c85 https://github.com/galaxyproject/galaxy/commit/e77fd47b034e6af5b19756bd778f5... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Fix boolean handling Commit: 419f3db64fb3614d5a70ed9a9eea8a260b6f5865 https://github.com/galaxyproject/galaxy/commit/419f3db64fb3614d5a70ed9a9eea8... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M lib/tool_shed/util/admin_util.py Log Message: ----------- Remove unused information feature for toolshed Commit: 733e225ec96b058dd159dda4e18ba1f7572573fd https://github.com/galaxyproject/galaxy/commit/733e225ec96b058dd159dda4e18ba... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M client/galaxy/scripts/utils/query-string-parsing.js M static/maps/utils/query-string-parsing.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/utils/query-string-parsing.js Log Message: ----------- Fix message handling in user preference main view Commit: a5d7c0fa84d8fe24fc94ac814b9f7502283de7c2 https://github.com/galaxyproject/galaxy/commit/a5d7c0fa84d8fe24fc94ac814b9f7... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-wrapper.js M static/maps/mvc/form/form-wrapper.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.map M static/scripts/mvc/form/form-wrapper.js Log Message: ----------- Scroll to highlight message Commit: 4b2eca373e936308b0550b9fabfc6494228b837a https://github.com/galaxyproject/galaxy/commit/4b2eca373e936308b0550b9fabfc6... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/api/users.py Log Message: ----------- Remove duplicate roles from selection list Commit: 5a8adbf8b77dc985353803a724fc4344dcbbdc79 https://github.com/galaxyproject/galaxy/commit/5a8adbf8b77dc985353803a724fc4... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-07 (Mon, 07 Aug 2017) Changed paths: M doc/source/admin/special_topics/grt.rst M lib/galaxy/dataset_collections/matching.py M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/runners/util/cli/__init__.py M lib/galaxy/jobs/runners/util/cli/shell/local.py M lib/galaxy/jobs/runners/util/cli/shell/rsh.py M lib/galaxy/objectstore/s3_multipart_upload.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/parser/yaml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/controllers/async.py M lib/galaxy/webapps/galaxy/controllers/history.py R scripts/grt.py R scripts/grt.yml.sample A scripts/grt/export.py A scripts/grt/grt.yml.sample A scripts/grt/upload.py M test/api/test_tools.py A test/functional/tools/identifier_source.xml M test/functional/tools/samples_tool_conf.xml A test/unit/test_remote_shell.py M test/unit/tools/test_toolbox.py M test/unit/tools_support.py M tox.ini Log Message: ----------- Merge branch 'remove_duplicates' into admin_grid_roles Commit: a7c6c69cbf6a6eeffdf53815144e623576c47b13 https://github.com/galaxyproject/galaxy/commit/a7c6c69cbf6a6eeffdf53815144e6... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-08 (Tue, 08 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Fix lint Commit: d3b8889c04ef22d740f8b668a8212c728ba5832c https://github.com/galaxyproject/galaxy/commit/d3b8889c04ef22d740f8b668a8212... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-08 (Tue, 08 Aug 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Fix second role link in admin panel Commit: c01023b5adc402a6a8662e9f319afcd9e4f5fc6e https://github.com/galaxyproject/galaxy/commit/c01023b5adc402a6a8662e9f319af... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-09 (Wed, 09 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Fix indention Commit: d32a3a58a50bdbdbe6144a265ef3424a2f011ae2 https://github.com/galaxyproject/galaxy/commit/d32a3a58a50bdbdbe6144a265ef34... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-09 (Wed, 09 Aug 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M config/datatypes_conf.xml.sample A config/user_preferences_extra_conf.yml.sample M lib/galaxy/config.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/text.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/managers/workflows.py M lib/galaxy/tools/parser/interface.py M lib/galaxy/tools/parser/output_objects.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/base/pluginframework.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/workflow/extract.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/util/workflow_util.py M lib/tool_shed/utility_containers/utility_container_manager.py M templates/webapps/tool_shed/repository/common.mako M test/unit/tools/test_parsing.py Log Message: ----------- Merge branch 'revise_page' into admin_grid_roles Commit: 938bf525f46c8d3c7568d9b2a97edfa958ba900f https://github.com/galaxyproject/galaxy/commit/938bf525f46c8d3c7568d9b2a97ed... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-10 (Thu, 10 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M lib/galaxy/managers/tags.py M lib/galaxy/model/__init__.py M lib/galaxy/model/mapping.py A lib/galaxy/model/migrate/versions/0135_add_library_tags.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/library_contents.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/user/user-preferences.js.map M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Merge branch 'revise_grid_forms' into admin_grid_roles Commit: be19b36ecaab43dd9cbf2fd5f80995e7ac9ff507 https://github.com/galaxyproject/galaxy/commit/be19b36ecaab43dd9cbf2fd5f8099... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-10 (Thu, 10 Aug 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js A client/galaxy/scripts/mvc/dataset/dataset-error.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js A client/galaxy/scripts/mvc/job/job-params.js M client/galaxy/style/less/galaxy_bootstrap/overrides.less M config/datatypes_conf.xml.sample A config/error_report.yml.sample M config/tool_conf.xml.sample A doc/source/admin/special_topics/bug_reports.rst M doc/source/admin/special_topics/index.rst M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/jobs/__init__.py M lib/galaxy/tools/__init__.py A lib/galaxy/tools/error_reports/__init__.py A lib/galaxy/tools/error_reports/plugins/__init__.py A lib/galaxy/tools/error_reports/plugins/biostars.py A lib/galaxy/tools/error_reports/plugins/email.py A lib/galaxy/tools/error_reports/plugins/json.py A lib/galaxy/tools/error_reports/plugins/sentry.py M lib/galaxy/tools/errors.py A lib/galaxy/tools/sort_collection_list.xml M lib/galaxy/util/biostar.py M lib/galaxy/util/plugin_config.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M scripts/grt/export.py M scripts/grt/upload.py A static/maps/mvc/dataset/dataset-error.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map A static/maps/mvc/job/job-params.js.map M static/maps/mvc/user/user-preferences.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 A static/scripts/mvc/dataset/dataset-error.js M static/scripts/mvc/dataset/dataset-li-edit.js A static/scripts/mvc/job/job-params.js M static/scripts/mvc/user/user-preferences.js M static/style/blue/base.css M templates/show_params.mako R templates/webapps/galaxy/dataset/errors.mako A test-data/test.vcf.gz M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml A test/functional/tools/vcf_bgzip.xml Log Message: ----------- Merge branch 'revise_grid_forms' into admin_grid_roles Commit: 33c794d273271b14732fb8037c2ea8105a3c688e https://github.com/galaxyproject/galaxy/commit/33c794d273271b14732fb8037c2ea... Author: John Chilton <jmchilton@gmail.com> Date: 2017-08-11 (Fri, 11 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/mvc/form/form-repeat.js M client/galaxy/scripts/mvc/form/form-wrapper.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/ui/ui-buttons.js M client/galaxy/scripts/mvc/ui/ui-list.js M client/galaxy/scripts/mvc/user/user-custom-builds.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/utils/query-string-parsing.js M client/galaxy/style/less/ui.less M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/tool_shed/util/admin_util.py M static/maps/mvc/form/form-repeat.js.map M static/maps/mvc/form/form-wrapper.js.map M static/maps/mvc/tool/tool-form.js.map M static/maps/mvc/ui/ui-buttons.js.map M static/maps/mvc/ui/ui-list.js.map M static/maps/mvc/user/user-custom-builds.js.map M static/maps/mvc/user/user-preferences.js.map M static/maps/utils/query-string-parsing.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/form/form-repeat.js M static/scripts/mvc/form/form-wrapper.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/ui/ui-buttons.js M static/scripts/mvc/ui/ui-list.js M static/scripts/mvc/user/user-custom-builds.js M static/scripts/mvc/user/user-preferences.js M static/scripts/utils/query-string-parsing.js M static/style/blue/base.css R templates/admin/dataset_security/role/role.mako R templates/admin/dataset_security/role/role_create.mako R templates/admin/dataset_security/role/role_rename.mako A templates/webapps/tool_shed/admin/dataset_security/role/role.mako A templates/webapps/tool_shed/admin/dataset_security/role/role_create.mako A templates/webapps/tool_shed/admin/dataset_security/role/role_rename.mako Log Message: ----------- Merge pull request #4385 from guerler/admin_grid_roles Admin grid roles revision Compare: https://github.com/galaxyproject/galaxy/compare/600b0aad7ce1...33c794d27327