Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 613f4fb1ced3c9a7e0d1417b8c9c14b681479bdd https://github.com/galaxyproject/galaxy/commit/613f4fb1ced3c9a7e0d1417b8c9c1... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-08 (Tue, 08 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/panels/admin-panel.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/libs.bundled.js.map Log Message: ----------- Use dict format for admin tool versions grid Commit: 381bf173d095ce51ba66d9cf19f5827c75c36dc8 https://github.com/galaxyproject/galaxy/commit/381bf173d095ce51ba66d9cf19f58... 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: ----------- Remove message from tool versions Commit: cdfaebdaa4722226cf121454aa02b455d324d265 https://github.com/galaxyproject/galaxy/commit/cdfaebdaa4722226cf121454aa02b... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-08 (Tue, 08 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/libs.bundled.js.map Log Message: ----------- Switch quotas grid to dict format Commit: 0e1b80b28f7558104c9a36bd1d224c60d91c2c70 https://github.com/galaxyproject/galaxy/commit/0e1b80b28f7558104c9a36bd1d224... 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 lib/galaxy/actions/admin.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/libs.bundled.js.map Log Message: ----------- Add async quota grid operations Commit: ad60f5a8ea4eaf574b4ffa1e51baa5bbe8282d47 https://github.com/galaxyproject/galaxy/commit/ad60f5a8ea4eaf574b4ffa1e51baa... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-08 (Tue, 08 Aug 2017) Changed paths: M lib/galaxy/actions/admin.py Log Message: ----------- Allow empty params Commit: 83a48f8f336a4c73dd1faabe3c84ce8801fb181d https://github.com/galaxyproject/galaxy/commit/83a48f8f336a4c73dd1faabe3c84c... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-08 (Tue, 08 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M lib/galaxy/actions/admin.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/libs.bundled.js.map Log Message: ----------- Build quota renaming form in admin panel using client side form builder Commit: 9dcc181f72d5f31b3d5feb45f673996714aca913 https://github.com/galaxyproject/galaxy/commit/9dcc181f72d5f31b3d5feb45f6739... 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 error message handling for quota operations, set default value for payloads to none Commit: 643f262ea913e8cc0f3bb5e39acf2af80194c71f https://github.com/galaxyproject/galaxy/commit/643f262ea913e8cc0f3bb5e39acf2... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-08 (Tue, 08 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M lib/galaxy/actions/admin.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/libs.bundled.js.map Log Message: ----------- Use client form builder to render edit quota amount form Commit: ad2dc168307037070205db27d7bdb09fb82d549f https://github.com/galaxyproject/galaxy/commit/ad2dc168307037070205db27d7bdb... 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 link to edit quota Commit: ae181d776fb9a565d7b51c18aa8edcae09018bc3 https://github.com/galaxyproject/galaxy/commit/ae181d776fb9a565d7b51c18aa8ed... 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: ----------- Provide async support for unsetting default quotas Commit: bd542000fa9ec420ba0f2e17d2b8f8047eb72f8c https://github.com/galaxyproject/galaxy/commit/bd542000fa9ec420ba0f2e17d2b8f... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-08 (Tue, 08 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: ----------- Build set default quota forms using client form builder Commit: 17cd7d16c2db988581e26ad59a88a57302a202c9 https://github.com/galaxyproject/galaxy/commit/17cd7d16c2db988581e26ad59a88a... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-08 (Tue, 08 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M lib/galaxy/actions/admin.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 manage role support for quotas Commit: 9f580d0630026157f2727651cce2e8f444f78cdc https://github.com/galaxyproject/galaxy/commit/9f580d0630026157f2727651cce2e... 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: ----------- Use consistent naming for group and role parameters Commit: 0f84d8bd91722c4bd36d5a736d6ca02a57460cfc https://github.com/galaxyproject/galaxy/commit/0f84d8bd91722c4bd36d5a736d6ca... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-09 (Wed, 09 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 client side form to create new quota Commit: 5647dfe5dbb22b7d09b1b760e41a2e0cd96cd8c8 https://github.com/galaxyproject/galaxy/commit/5647dfe5dbb22b7d09b1b760e41a2... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-09 (Wed, 09 Aug 2017) Changed paths: R templates/admin/quota/quota.mako R templates/admin/quota/quota_create.mako R templates/admin/quota/quota_edit.mako R templates/admin/quota/quota_rename.mako R templates/admin/quota/quota_set_default.mako Log Message: ----------- Remove unused quota makos Commit: 33acc1f8a337977eb85e9ba570f3404476411edc https://github.com/galaxyproject/galaxy/commit/33acc1f8a337977eb85e9ba570f34... 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/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/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.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 config/user_preferences_extra_conf.yml.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/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/__init__.py M lib/galaxy/jobs/command_factory.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/tools/__init__.py M lib/galaxy/tools/actions/upload_common.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 M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parser/interface.py M lib/galaxy/tools/parser/output_objects.py A lib/galaxy/tools/sort_collection_list.xml M lib/galaxy/tools/toolbox/base.py M lib/galaxy/util/biostar.py M lib/galaxy/util/plugin_config.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/jobs.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/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/dataset.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 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/library/library-dataset-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.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/library/library-dataset-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/style/blue/base.css M templates/show_params.mako R templates/webapps/galaxy/dataset/errors.mako M templates/webapps/tool_shed/repository/common.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 M test/unit/tools/test_parsing.py Log Message: ----------- Merge branch 'admin_grid_groups' into admin_grid_toolversion Commit: ef2c32ae84706897e70fa41808f46d95f1132ec9 https://github.com/galaxyproject/galaxy/commit/ef2c32ae84706897e70fa41808f46... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-11 (Fri, 11 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Fix lint Commit: b726c33c80b33ece878343b6208e65f3d983008f https://github.com/galaxyproject/galaxy/commit/b726c33c80b33ece878343b6208e6... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M Makefile M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M config/datatypes_conf.xml.sample M config/galaxy.ini.sample R config/reports.ini.sample A config/reports.yml.sample R config/tool_shed.ini.sample A config/tool_shed.yml.sample M doc/source/admin/dependency_resolvers.rst A doc/source/admin/reports.rst A doc/source/admin/reports_options.rst M lib/galaxy/config.py M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/sniff.py A lib/galaxy/datatypes/test/1.xls M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/__init__.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/orm/scripts.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/util/checkers.py M lib/galaxy/util/properties.py M lib/galaxy/web/framework/webapp.py A lib/galaxy/webapps/config_manage.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/reports/buildapp.py A lib/galaxy/webapps/reports/config_schema.yml A lib/galaxy/webapps/reports/uwsgi_schema.yml M lib/galaxy/webapps/tool_shed/buildapp.py A lib/galaxy/webapps/tool_shed/config_schema.yml A lib/galaxy/webapps/tool_shed/uwsgi_schema.yml A lib/galaxy/webapps/uwsgi_schema.yml M lib/galaxy/workflow/modules.py M openid/yahoo.xml M run.sh M run_reports.sh M run_tool_shed.sh A scripts/common_startup_functions.sh A scripts/config_sample_to_kwalify.py M scripts/manage_tools.py M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/workflow/workflow-forms.js.map M static/maps/mvc/workflow/workflow-manager.js.map M static/maps/mvc/workflow/workflow-node.js.map M static/maps/mvc/workflow/workflow-view.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/library/library-foldertoolbar-view.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/workflow/workflow-forms.js M static/scripts/mvc/workflow/workflow-manager.js M static/scripts/mvc/workflow/workflow-node.js M static/scripts/mvc/workflow/workflow-view.js A test-data/1.sam.gz A test-data/bad.html.gz A test-data/random-file M test/api/test_tools.py M test/api/test_workflows.py M test/base/api.py M test/base/interactor.py M test/base/populators.py M test/functional/tools/sample_datatypes_conf.xml A test/integration/test_upload_configuration_options.py A test/unit/config/1607_root_filters/config/galaxy.ini A test/unit/config/1607_root_filters/config/tool_shed.ini A test/unit/config/1607_root_samples/config/galaxy.ini A test/unit/config/1607_root_samples/config/reports.ini A test/unit/config/1607_root_samples/config/tool_shed.ini A test/unit/config/test_config_manage.py M tools/data_source/upload.py M tools/data_source/upload.xml Log Message: ----------- Merge branch 'admin_grid_groups' into admin_grid_toolversion Commit: 9dfee375e9782f421832ecc44981a2cbdfc4f183 https://github.com/galaxyproject/galaxy/commit/9dfee375e9782f421832ecc44981a... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-parameters.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M static/maps/mvc/form/form-parameters.js.map M static/maps/mvc/ui/ui-select-content.js.map M static/maps/mvc/ui/ui-select-default.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-parameters.js M static/scripts/mvc/ui/ui-select-content.js M static/scripts/mvc/ui/ui-select-default.js Log Message: ----------- Optionally allow to show or hide select all Commit: a1897bd32a112e68ce09b71fd6ad98e6b97f267b https://github.com/galaxyproject/galaxy/commit/a1897bd32a112e68ce09b71fd6ad9... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Hide select all for role and group selectors Commit: d6f6a78ab8464bf1a10cbca74632873993744933 https://github.com/galaxyproject/galaxy/commit/d6f6a78ab8464bf1a10cbca746328... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 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: ----------- Use 'Save' as default title for configuration forms Commit: 4688eef2a41e79b44e8cb19ad87d5f2fc9a3aaf1 https://github.com/galaxyproject/galaxy/commit/4688eef2a41e79b44e8cb19ad87d5... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/actions/admin.py M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Fix user id decoding, fix optional array handling Commit: 96cad03980b314a7a89a01a5e1d442b2855a22e8 https://github.com/galaxyproject/galaxy/commit/96cad03980b314a7a89a01a5e1d44... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Fix label for default quotas Commit: 246489a7aa2b950d7a12bf2610faaaed26d90a55 https://github.com/galaxyproject/galaxy/commit/246489a7aa2b950d7a12bf2610faa... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/actions/admin.py Log Message: ----------- Fix messages Commit: f9e889215021f7a99a4ccfe4612431caa963f63c https://github.com/galaxyproject/galaxy/commit/f9e889215021f7a99a4ccfe461243... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Catch user input error for auto created roles and groups Commit: bebc5ff56ae41a2660f884a2b04604b2a473dd11 https://github.com/galaxyproject/galaxy/commit/bebc5ff56ae41a2660f884a2b0460... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Move decode id to correct location Commit: f1e13cef05759bc7782248c08d595043d03161fe https://github.com/galaxyproject/galaxy/commit/f1e13cef05759bc7782248c08d595... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/actions/admin.py Log Message: ----------- More messages to validate inputs Commit: 86cdaaf610011b2b0c43f1bd93d36d87907b30e7 https://github.com/galaxyproject/galaxy/commit/86cdaaf610011b2b0c43f1bd93d36... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Add validation messages if resource ids are not correct Commit: 2073151bf2f6b2c2427c10934b1feea967d010ff https://github.com/galaxyproject/galaxy/commit/2073151bf2f6b2c2427c10934b1fe... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Log Message: ----------- Merge branch 'dev' into admin_grid_toolversion Commit: fdcd46918d52c4ee8ab7c2c421fd3e559c9a1fdc https://github.com/galaxyproject/galaxy/commit/fdcd46918d52c4ee8ab7c2c421fd3... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-16 (Wed, 16 Aug 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Remove unfilterable columns from group and quota search grids Commit: 2c4cf686f8fffd17bb7a248571fa7d502f52a046 https://github.com/galaxyproject/galaxy/commit/2c4cf686f8fffd17bb7a248571fa7... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-08-16 (Wed, 16 Aug 2017) Changed paths: M client/galaxy/scripts/galaxy.pages.js M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/dataset/data.js M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/job/job-params.js M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-folder-view.js M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-folderrow-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-library-view.js M client/galaxy/scripts/mvc/library/library-libraryrow-view.js M client/galaxy/scripts/mvc/library/library-model.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/toolshed/categories-view.js M client/galaxy/scripts/mvc/toolshed/repo-status-view.js M client/galaxy/scripts/mvc/toolshed/repositories-view.js M client/galaxy/scripts/mvc/toolshed/repository-queue-view.js M client/galaxy/scripts/mvc/toolshed/repository-view.js M client/galaxy/scripts/mvc/toolshed/util.js M client/galaxy/scripts/mvc/toolshed/workflows-view.js M client/galaxy/scripts/mvc/ui/ui-drilldown.js M client/galaxy/scripts/mvc/ui/ui-popover.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/mvc/upload/upload-view.js M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/reports_webapp/run_stats.js M client/galaxy/scripts/ui/scroll-panel.js M client/galaxy/scripts/utils/graph.js M client/galaxy/scripts/utils/uploadbox.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/phyloviz.js M client/galaxy/scripts/viz/trackster/painters.js M client/galaxy/scripts/viz/trackster/tracks.js M client/toolshed/scripts/mvc/groups/group-list-view.js M config/plugins/interactive_environments/rstudio/static/js/crypto/base64.js M config/plugins/interactive_environments/rstudio/static/js/crypto/rstudio.big.js M config/plugins/interactive_environments/rstudio/static/js/crypto/rstudio/base64.js M config/plugins/interactive_environments/rstudio/static/js/crypto/wu/base64.js M config/plugins/visualizations/charts/static/client/components/screenshot.js M config/plugins/visualizations/charts/static/repository/plugins/biojs/drawrnajs/views/optspanel.js M config/plugins/visualizations/charts/static/repository/plugins/biojs/drawrnajs/views/vispanel.js M config/plugins/visualizations/charts/static/repository/visualizations/utilities/tabular-form.js M config/plugins/visualizations/charts/static/repository/visualizations/utilities/tabular-utilities.js M config/plugins/visualizations/graphviz/static/js/toolPanelFunctions.js M config/plugins/webhooks/demo/search/static/script.js M lib/galaxy/security/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/web/proxy/js/lib/proxy.js M scripts/communication/template/communication.js M static/maps/galaxy.pages.js.map M static/maps/mvc/collection/list-collection-creator.js.map M static/maps/mvc/dataset/data.js.map M static/maps/mvc/grid/grid-template.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-folder-view.js.map M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-folderrow-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/library/library-library-view.js.map M static/maps/mvc/library/library-libraryrow-view.js.map M static/maps/mvc/library/library-model.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/maps/mvc/toolshed/categories-view.js.map M static/maps/mvc/toolshed/repo-status-view.js.map M static/maps/mvc/toolshed/repositories-view.js.map M static/maps/mvc/toolshed/repository-queue-view.js.map M static/maps/mvc/toolshed/repository-view.js.map M static/maps/mvc/toolshed/util.js.map M static/maps/mvc/toolshed/workflows-view.js.map M static/maps/mvc/ui/ui-drilldown.js.map M static/maps/mvc/ui/ui-popover.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/maps/mvc/upload/upload-ftp.js.map M static/maps/mvc/upload/upload-view.js.map M static/maps/mvc/workflow/workflow-forms.js.map M static/maps/mvc/workflow/workflow-manager.js.map M static/maps/mvc/workflow/workflow-node.js.map M static/maps/mvc/workflow/workflow-terminals.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/maps/reports_webapp/run_stats.js.map M static/maps/ui/scroll-panel.js.map M static/maps/utils/graph.js.map M static/maps/utils/uploadbox.js.map M static/maps/viz/circster.js.map M static/maps/viz/phyloviz.js.map M static/maps/viz/trackster/painters.js.map M static/maps/viz/trackster/tracks.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/galaxy.pages.js M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/dataset/data.js M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/grid/grid-view.js M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-folder-view.js M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-folderrow-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/library/library-library-view.js M static/scripts/mvc/library/library-libraryrow-view.js M static/scripts/mvc/library/library-model.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/toolshed/categories-view.js M static/scripts/mvc/toolshed/repo-status-view.js M static/scripts/mvc/toolshed/repositories-view.js M static/scripts/mvc/toolshed/repository-queue-view.js M static/scripts/mvc/toolshed/repository-view.js M static/scripts/mvc/toolshed/util.js M static/scripts/mvc/toolshed/workflows-view.js M static/scripts/mvc/ui/ui-drilldown.js M static/scripts/mvc/ui/ui-popover.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/upload/upload-ftp.js M static/scripts/mvc/upload/upload-view.js M static/scripts/mvc/workflow/workflow-forms.js M static/scripts/mvc/workflow/workflow-manager.js M static/scripts/mvc/workflow/workflow-node.js M static/scripts/mvc/workflow/workflow-terminals.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/reports_webapp/run_stats.js M static/scripts/ui/scroll-panel.js M static/scripts/utils/graph.js M static/scripts/utils/uploadbox.js M static/scripts/viz/circster.js M static/scripts/viz/phyloviz.js M static/scripts/viz/trackster/painters.js M static/scripts/viz/trackster/tracks.js M test/unit/tools/test_actions.py M test/unit/tools/test_collect_primary_datasets.py M test/unit/tools/test_execution.py M test/unit/tools/test_parameter_parsing.py M test/unit/tools/test_toolbox.py M test/unit/tools_support.py M test/unit/unittest_utils/galaxy_mock.py Log Message: ----------- Merge branch 'dev' into admin_grid_toolversion and repack Commit: 04583346a1970f9bab4f0cd3b9e8693de4fedbf9 https://github.com/galaxyproject/galaxy/commit/04583346a1970f9bab4f0cd3b9e86... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-08-16 (Wed, 16 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/mvc/form/form-parameters.js M client/galaxy/scripts/mvc/form/form-wrapper.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M lib/galaxy/actions/admin.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M static/maps/mvc/form/form-parameters.js.map M static/maps/mvc/form/form-wrapper.js.map M static/maps/mvc/ui/ui-select-content.js.map M static/maps/mvc/ui/ui-select-default.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.map M static/scripts/mvc/form/form-parameters.js M static/scripts/mvc/form/form-wrapper.js M static/scripts/mvc/ui/ui-select-content.js M static/scripts/mvc/ui/ui-select-default.js R templates/admin/quota/quota.mako R templates/admin/quota/quota_create.mako R templates/admin/quota/quota_edit.mako R templates/admin/quota/quota_rename.mako R templates/admin/quota/quota_set_default.mako Log Message: ----------- Merge pull request #4411 from guerler/admin_grid_toolversion replace mako templates for tool lineage and quotas grids Compare: https://github.com/galaxyproject/galaxy/compare/1b7f25eeaec9...04583346a197