Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a7885e0b6e195ecc1beaab6f526ce52e927053c2 https://github.com/galaxyproject/galaxy/commit/a7885e0b6e195ecc1beaab6f526ce... Author: guerler aysam.guerler@gmail.com Date: 2017-08-03 (Thu, 03 Aug 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.js A client/galaxy/scripts/mvc/form/form-wrapper.js M client/galaxy/scripts/mvc/user/user-preferences.js A 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 A static/scripts/mvc/form/form-wrapper.js M static/scripts/mvc/user/user-preferences.js

Log Message: ----------- Generalize how user preferences build forms

Commit: ddcace7527d6fc20ce93c983d795ff3b35117191 https://github.com/galaxyproject/galaxy/commit/ddcace7527d6fc20ce93c983d795f... Author: guerler aysam.guerler@gmail.com Date: 2017-08-03 (Thu, 03 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/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: ----------- Remove unused options parsing

Commit: 6c11ffbe84f2e279607a5dd16f6d0532d26dc1f9 https://github.com/galaxyproject/galaxy/commit/6c11ffbe84f2e279607a5dd16f6d0... Author: guerler aysam.guerler@gmail.com Date: 2017-08-03 (Thu, 03 Aug 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: ----------- User generic form wrapper to reset password

Commit: cd8314808e67dc8a880c0bb16a1faf4e5a571456 https://github.com/galaxyproject/galaxy/commit/cd8314808e67dc8a880c0bb16a1fa... Author: guerler aysam.guerler@gmail.com Date: 2017-08-03 (Thu, 03 Aug 2017)

Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/utils/query-string-parsing.js M lib/galaxy/webapps/galaxy/controllers/admin.py 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/utils/query-string-parsing.js

Log Message: ----------- Allow array parsing through url

Commit: 06b5be23ddec4298cd78503e6e07f2949d882a6e https://github.com/galaxyproject/galaxy/commit/06b5be23ddec4298cd78503e6e07f... Author: guerler aysam.guerler@gmail.com Date: 2017-08-03 (Thu, 03 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/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: ----------- Specify password reset form

Commit: e0ccec46b3f4f4d8f13091fa2f5dcafd987c7b51 https://github.com/galaxyproject/galaxy/commit/e0ccec46b3f4f4d8f13091fa2f5dc... Author: guerler aysam.guerler@gmail.com Date: 2017-08-03 (Thu, 03 Aug 2017)

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

Log Message: ----------- Move help info

Commit: c6dee98c55a46b23e9373ea53c4fa22e545978a3 https://github.com/galaxyproject/galaxy/commit/c6dee98c55a46b23e9373ea53c4fa... 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 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 input types, repack scripts

Commit: 23b141a2ec3e5ff865a8ea0718d41b9845e79d64 https://github.com/galaxyproject/galaxy/commit/23b141a2ec3e5ff865a8ea0718d41... 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: ----------- Complete new controller endpoint to reset passwords

Commit: 8312b07e60ee945fdde6ecc29eadcac9423ab3d5 https://github.com/galaxyproject/galaxy/commit/8312b07e60ee945fdde6ecc29eadc... 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/grid/grid-template.js M static/maps/mvc/form/form-wrapper.js.map M static/maps/mvc/grid/grid-template.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 M static/scripts/mvc/grid/grid-template.js

Log Message: ----------- Allow form redirect to grid view

Commit: 4e050282652ea3c3cbf20998653acb9a34a85415 https://github.com/galaxyproject/galaxy/commit/4e050282652ea3c3cbf20998653ac... Author: guerler aysam.guerler@gmail.com Date: 2017-08-04 (Fri, 04 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: ----------- Create dictionary for form definitions

Commit: f50e0ba5bba5fe6605bcbcc446ddb10f58ae898b https://github.com/galaxyproject/galaxy/commit/f50e0ba5bba5fe6605bcbcc446ddb... 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-view.js M client/galaxy/scripts/mvc/form/form-wrapper.js M lib/galaxy/webapps/galaxy/controllers/admin.py M static/maps/mvc/form/form-view.js.map 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-view.js M static/scripts/mvc/form/form-wrapper.js

Log Message: ----------- Revise endpoint to manage user roles and groups, add initial message support to form wrapper

Commit: 7e1c40799efa67f43fe13b589ef2432b05fdebc3 https://github.com/galaxyproject/galaxy/commit/7e1c40799efa67f43fe13b589ef24... 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/controllers/admin.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.map M static/scripts/mvc/form/form-wrapper.js

Log Message: ----------- Use initial method parsing for reset password info

Commit: 63ebee1a415a9433b01164ef72e90e08c177fc18 https://github.com/galaxyproject/galaxy/commit/63ebee1a415a9433b01164ef72e90... 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: ----------- Add put handling to revised manage_roles_and_groups_for_user controller endpoint

Commit: e791ac29bb310cefcbcc8afd762c7c7ddec54586 https://github.com/galaxyproject/galaxy/commit/e791ac29bb310cefcbcc8afd762c7... Author: guerler aysam.guerler@gmail.com Date: 2017-08-04 (Fri, 04 Aug 2017)

Changed paths: M lib/tool_shed/grids/admin_grids.py M lib/tool_shed/util/admin_util.py 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

Log Message: ----------- Move user form grid makos to toolshed

Commit: 3007122bd9c9e111ef8d0010707ddac51bff6387 https://github.com/galaxyproject/galaxy/commit/3007122bd9c9e111ef8d0010707dd... Author: guerler aysam.guerler@gmail.com Date: 2017-08-04 (Fri, 04 Aug 2017)

Changed paths: M templates/webapps/tool_shed/admin/user/reset_password.mako M templates/webapps/tool_shed/admin/user/user.mako

Log Message: ----------- Remove custom case handling for galaxy app from makos, restoring previous state

Commit: 146dd82f043c9adaa8f2891f03ab31f76b16af2e https://github.com/galaxyproject/galaxy/commit/146dd82f043c9adaa8f2891f03ab3... 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/grids/admin_grids.py 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/webapps/tool_shed/repository/grid.mako

Log Message: ----------- Remove unnecessary grid makos

Commit: c2b98bce78366b4daf33b76c7a1fe2d465212274 https://github.com/galaxyproject/galaxy/commit/c2b98bce78366b4daf33b76c7a1fe... Author: guerler aysam.guerler@gmail.com Date: 2017-08-04 (Fri, 04 Aug 2017)

Changed paths: M lib/tool_shed/grids/repository_grids.py

Log Message: ----------- Remove unused grid makos

Commit: 010a7dfb9ce1e0002c2ea81d7ff88dbe3c1ecb38 https://github.com/galaxyproject/galaxy/commit/010a7dfb9ce1e0002c2ea81d7ff88... Author: guerler aysam.guerler@gmail.com Date: 2017-08-04 (Fri, 04 Aug 2017)

Changed paths: M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py R templates/admin/tool_shed_repository/grid.mako

Log Message: ----------- Remove unused toolshed grid mako

Commit: 96cc67a2caf6470c235d871878a86e6ebaca3b1c https://github.com/galaxyproject/galaxy/commit/96cc67a2caf6470c235d871878a86... 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: ----------- Fix lint

Commit: 9dc5ace31a5ec847e408baeaccb9dbd7433f02b7 https://github.com/galaxyproject/galaxy/commit/9dc5ace31a5ec847e408baeaccb9d... 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: ----------- Remove lines

Commit: d2d250b847f22934a2f1d3c1d2256b40c52abc55 https://github.com/galaxyproject/galaxy/commit/d2d250b847f22934a2f1d3c1d2256... 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/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 'dev' into revise_grid_forms

Commit: f531d2c0c9810b2d0ee8f0482cb12e163bbc0de2 https://github.com/galaxyproject/galaxy/commit/f531d2c0c9810b2d0ee8f0482cb12... 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/maps/layout/menu.js.map M static/maps/mvc/user/user-preferences.js.map M static/scripts/galaxy.js M static/scripts/layout/menu.js M static/scripts/mvc/user/user-preferences.js

Log Message: ----------- Repack scripts

Commit: c49e749534f76c8bb2d0ea8bb629a6ee236ff5cc https://github.com/galaxyproject/galaxy/commit/c49e749534f76c8bb2d0ea8bb629a... 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: ----------- Fix user info link for toolshed

Commit: e477cce9b68d90a313d1534c3ad156f9eb8cc6ec https://github.com/galaxyproject/galaxy/commit/e477cce9b68d90a313d1534c3ad15... Author: guerler aysam.guerler@gmail.com Date: 2017-08-10 (Thu, 10 Aug 2017)

Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M config/datatypes_conf.xml.sample A config/user_preferences_extra_conf.yml.sample M doc/source/admin/special_topics/grt.rst M lib/galaxy/config.py M lib/galaxy/dataset_collections/matching.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/dependencies/pinned-requirements.txt M lib/galaxy/jobs/command_factory.py 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/managers/tags.py M lib/galaxy/managers/workflows.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/objectstore/s3_multipart_upload.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parser/interface.py M lib/galaxy/tools/parser/output_objects.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/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/lda_datasets.py M lib/galaxy/webapps/galaxy/api/library_contents.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/controllers/async.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/library_common.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 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 static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M templates/webapps/tool_shed/repository/common.mako 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_parsing.py M test/unit/tools/test_toolbox.py M test/unit/tools_support.py M tox.ini

Log Message: ----------- Merge branch 'revise_page' into revise_grid_forms

Commit: b8c05ede4dd188dce24c914912f8fa35963d9562 https://github.com/galaxyproject/galaxy/commit/b8c05ede4dd188dce24c914912f8f... Author: guerler aysam.guerler@gmail.com Date: 2017-08-10 (Thu, 10 Aug 2017)

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

Commit: 583765c7c087c77c6d1f2756e4233ce97a71240f https://github.com/galaxyproject/galaxy/commit/583765c7c087c77c6d1f2756e4233... 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/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/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 'dev' into revise_grid_forms

Commit: 600b0aad7ce10c1e427513684c4cd7423f5b52aa https://github.com/galaxyproject/galaxy/commit/600b0aad7ce10c1e427513684c4cd... Author: Martin Cech marten@bx.psu.edu 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/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/utils/query-string-parsing.js M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M lib/tool_shed/grids/admin_grids.py M lib/tool_shed/grids/repository_grids.py M lib/tool_shed/util/admin_util.py 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/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/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/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_shed_repository/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 pull request #4377 from guerler/revise_grid_forms

Remove makos of admin user grid forms

Compare: https://github.com/galaxyproject/galaxy/compare/6353704e4b44...600b0aad7ce1