Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: f663e09b29dd166e846268468e4f088d05e3f85d https://github.com/galaxyproject/galaxy/commit/f663e09b29dd166e846268468e4f0... Author: guerler <aysam.guerler@gmail.com> Date: 2019-01-16 (Wed, 16 Jan 2019) Changed paths: M client/galaxy/style/scss/overrides.scss M client/galaxy/style/scss/upload.scss Log Message: ----------- Use regular font-size in popovers by default Commit: 9a6ae4d9d64f338a7069d736dd7b0026d02db865 https://github.com/galaxyproject/galaxy/commit/9a6ae4d9d64f338a7069d736dd7b0... Author: guerler <aysam.guerler@gmail.com> Date: 2019-01-16 (Wed, 16 Jan 2019) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js Log Message: ----------- Use multistring for composite upload row template Commit: 73e027b8a6429e8882fb606f184a0108ae70daa5 https://github.com/galaxyproject/galaxy/commit/73e027b8a6429e8882fb606f184a0... Author: guerler <aysam.guerler@gmail.com> Date: 2019-01-16 (Wed, 16 Jan 2019) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-view.js Log Message: ----------- Use multistring for composite upload view template Commit: 4c0df7ef1ff4c39632c915de25ea37f861970566 https://github.com/galaxyproject/galaxy/commit/4c0df7ef1ff4c39632c915de25ea3... Author: guerler <aysam.guerler@gmail.com> Date: 2019-01-16 (Wed, 16 Jan 2019) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-view.js Log Message: ----------- Use multistring for collection upload view template Commit: 7e4a0518e59cdd11568b550440e549b6668808c7 https://github.com/galaxyproject/galaxy/commit/7e4a0518e59cdd11568b550440e54... Author: guerler <aysam.guerler@gmail.com> Date: 2019-01-16 (Wed, 16 Jan 2019) Changed paths: M client/galaxy/style/scss/upload.scss Log Message: ----------- Fix font size handling in upload view Commit: ca4e5677db9044b993fe7ac552c1b0dbf5dd4e2c https://github.com/galaxyproject/galaxy/commit/ca4e5677db9044b993fe7ac552c1b... Author: guerler <aysam.guerler@gmail.com> Date: 2019-01-16 (Wed, 16 Jan 2019) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/style/scss/upload.scss Log Message: ----------- Fix footer styles in upload view Commit: bdc2584d1206a785b522c08e859a7b1fb3b70e29 https://github.com/galaxyproject/galaxy/commit/bdc2584d1206a785b522c08e859a7... Author: guerler <aysam.guerler@gmail.com> Date: 2019-01-17 (Thu, 17 Jan 2019) Changed paths: M .travis.yml M Makefile A client/.eslintignore A client/.eslintrc.js M client/galaxy/scripts/app/galaxy.js M client/galaxy/scripts/components/Alert.vue M client/galaxy/scripts/components/Citations.vue M client/galaxy/scripts/components/DataDialog.vue M client/galaxy/scripts/components/DisplayStructured.vue M client/galaxy/scripts/components/GalaxyLoader.vue M client/galaxy/scripts/components/HistoryImport.vue M client/galaxy/scripts/components/HistoryView.vue M client/galaxy/scripts/components/Masthead/index.vue M client/galaxy/scripts/components/Message.vue M client/galaxy/scripts/components/PluginList.vue M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/components/RulesDisplay.vue M client/galaxy/scripts/components/Sharing.vue M client/galaxy/scripts/components/WorkflowImport.vue M client/galaxy/scripts/components/admin/BaseGrid.vue M client/galaxy/scripts/components/admin/DataManager/DataManager.vue M client/galaxy/scripts/components/admin/DataManager/DataManagerJob.vue M client/galaxy/scripts/components/admin/DataManager/DataManagerJobs.vue M client/galaxy/scripts/components/admin/DataManager/DataManagerTable.vue M client/galaxy/scripts/components/admin/DataManager/DataManagerView.vue M client/galaxy/scripts/components/admin/DataManagerGrid.vue M client/galaxy/scripts/components/admin/DataTables.vue M client/galaxy/scripts/components/admin/DataTablesGrid.vue M client/galaxy/scripts/components/admin/DataTypes.vue M client/galaxy/scripts/components/admin/DisplayApplications.vue M client/galaxy/scripts/components/admin/ErrorStack.vue M client/galaxy/scripts/entry/admin/index.js M client/galaxy/scripts/entry/analysis/AnalysisRouter.js M client/galaxy/scripts/galaxy.interactive_environments.js M client/galaxy/scripts/i18n.js M client/galaxy/scripts/layout/communication-server-view.js M client/galaxy/scripts/layout/data.js M client/galaxy/scripts/legacy/grid/grid-view.js M client/galaxy/scripts/mvc/annotation.js M client/galaxy/scripts/mvc/base-mvc.js M client/galaxy/scripts/mvc/collection/base-creator.js M client/galaxy/scripts/mvc/collection/collection-li-edit.js M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/collection/collection-view-edit.js M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/collection/pair-collection-creator.js M client/galaxy/scripts/mvc/dataset/data.js M client/galaxy/scripts/mvc/dataset/dataset-choice.js M client/galaxy/scripts/mvc/dataset/dataset-list.js M client/galaxy/scripts/mvc/form/form-input.js M client/galaxy/scripts/mvc/form/form-parameters.js M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/form/form-view.js M client/galaxy/scripts/mvc/grid/grid-model.js M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/history/copy-dialog.js M client/galaxy/scripts/mvc/history/hda-li-edit.js M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/scripts/mvc/history/hda-model.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/scripts/mvc/history/hdca-model.js M client/galaxy/scripts/mvc/history/history-content-model.js M client/galaxy/scripts/mvc/history/history-item-li.js M client/galaxy/scripts/mvc/history/history-preferences.js M client/galaxy/scripts/mvc/history/history-view-annotated.js M client/galaxy/scripts/mvc/history/job-dag.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/job/job-li.js R client/galaxy/scripts/mvc/job/job-params.js M client/galaxy/scripts/mvc/lazy/lazy-limited.js M client/galaxy/scripts/mvc/library/library-dataset-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-librarylist-view.js M client/galaxy/scripts/mvc/rules/rule-definitions.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/tool/tool-genomespace.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/scripts/mvc/toolshed/repo-status-view.js M client/galaxy/scripts/mvc/toolshed/repository-view.js M client/galaxy/scripts/mvc/toolshed/shed-list-view.js M client/galaxy/scripts/mvc/ui/icon-button.js M client/galaxy/scripts/mvc/ui/popup-menu.js M client/galaxy/scripts/mvc/ui/ui-buttons.js M client/galaxy/scripts/mvc/ui/ui-color-picker.js M client/galaxy/scripts/mvc/ui/ui-drilldown.js M client/galaxy/scripts/mvc/ui/ui-list.js M client/galaxy/scripts/mvc/ui/ui-misc.js M client/galaxy/scripts/mvc/ui/ui-modal.js M client/galaxy/scripts/mvc/ui/ui-options.js M client/galaxy/scripts/mvc/ui/ui-popover.js M client/galaxy/scripts/mvc/ui/ui-portlet.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js M client/galaxy/scripts/mvc/ui/ui-select.js M client/galaxy/scripts/mvc/ui/ui-slider.js M client/galaxy/scripts/mvc/ui/ui-table.js M client/galaxy/scripts/mvc/ui/ui-tabs.js M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/upload-button.js M client/galaxy/scripts/mvc/upload/upload-extension.js M client/galaxy/scripts/mvc/upload/upload-model.js M client/galaxy/scripts/mvc/upload/upload-settings.js M client/galaxy/scripts/mvc/user/user-model.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/user/user-quotameter.js M client/galaxy/scripts/mvc/visualization/chart/components/model.js M client/galaxy/scripts/mvc/visualization/chart/components/screenshot.js M client/galaxy/scripts/mvc/visualization/chart/utilities/series.js M client/galaxy/scripts/mvc/visualization/chart/views/editor.js M client/galaxy/scripts/mvc/visualization/chart/views/groups.js M client/galaxy/scripts/mvc/visualization/chart/views/menu.js M client/galaxy/scripts/mvc/visualization/chart/views/settings.js M client/galaxy/scripts/mvc/visualization/chart/views/viewer.js M client/galaxy/scripts/mvc/workflow/workflow-canvas.js M client/galaxy/scripts/mvc/workflow/workflow-connector.js M client/galaxy/scripts/mvc/workflow/workflow-forms.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-node.js M client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js M client/galaxy/scripts/polyfills.js M client/galaxy/scripts/qunit/tests/form_tests.js M client/galaxy/scripts/reports/run_stats.js M client/galaxy/scripts/toolshed/groups/group-detail-view.js M client/galaxy/scripts/toolshed/groups/group-list-view.js M client/galaxy/scripts/toolshed/groups/group-listrow-view.js M client/galaxy/scripts/toolshed/toolshed.groups.js M client/galaxy/scripts/ui/autocom_tagging.js M client/galaxy/scripts/ui/fa-icon-button.js M client/galaxy/scripts/ui/filter-control.js M client/galaxy/scripts/ui/mode-button.js M client/galaxy/scripts/ui/pagination.js M client/galaxy/scripts/ui/peek-column-selector.js M client/galaxy/scripts/ui/popupmenu.js M client/galaxy/scripts/ui/scroll-panel.js M client/galaxy/scripts/unitTestBundle.js M client/galaxy/scripts/utils/ajax-queue.js M client/galaxy/scripts/utils/graph.js M client/galaxy/scripts/utils/localization.js M client/galaxy/scripts/utils/metrics-logger.js M client/galaxy/scripts/utils/natural-sort.js M client/galaxy/scripts/utils/query-string-parsing.js M client/galaxy/scripts/utils/utils.js M client/galaxy/scripts/viz/bbi-data-manager.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/phyloviz.js M client/galaxy/scripts/viz/sweepster.js M client/galaxy/scripts/viz/trackster/filters.js M client/galaxy/scripts/viz/trackster/painters.js M client/galaxy/scripts/viz/trackster/slotting.js M client/galaxy/scripts/viz/trackster/tracks.js M client/galaxy/scripts/viz/trackster/util.js M client/galaxy/scripts/viz/visualization.js M client/galaxy/style/scss/base.scss M client/galaxy/style/scss/theme/blue.scss M client/package.json A client/prettier.config.js M client/yarn.lock R config/openid_conf.xml.sample M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/datatypes/metadata.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/jobs/__init__.py M lib/galaxy/managers/configuration.py A lib/galaxy/metadata/__init__.py M lib/galaxy/model/__init__.py M lib/galaxy/model/mapping.py M lib/galaxy/model/metadata.py R lib/galaxy/openid/__init__.py R lib/galaxy/openid/providers.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/metadata.py R lib/galaxy/web/framework/openid_manager.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/config_schema.yml M lib/galaxy/webapps/galaxy/controllers/authnz.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/tool_shed/app.py M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/webapps/tool_shed/config_schema.yml M lib/galaxy_ext/metadata/set_metadata.py M templates/user/index.mako M templates/user/login.mako R templates/user/openid_associate.mako R templates/user/openid_manage.mako M tox.ini Log Message: ----------- Merge branch 'dev' into upload_view_fixes Commit: bf27a7c99364d634182554c7126ad957c915203f https://github.com/galaxyproject/galaxy/commit/bf27a7c99364d634182554c7126ad... Author: guerler <aysam.guerler@gmail.com> Date: 2019-01-17 (Thu, 17 Jan 2019) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/scripts/mvc/upload/collection/rules-input-view.js M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/style/scss/upload.scss Log Message: ----------- Use regular font size throughout uploader Commit: 43409ce5cb3e76648d31c4e4d09db260a28b6a69 https://github.com/galaxyproject/galaxy/commit/43409ce5cb3e76648d31c4e4d09db... Author: guerler <aysam.guerler@gmail.com> Date: 2019-01-17 (Thu, 17 Jan 2019) Changed paths: M client/galaxy/style/scss/upload.scss Log Message: ----------- Fix collection uploaders table header alignment Commit: 1cacdb76eb92927ed69b2ba0ae6af123a08fd685 https://github.com/galaxyproject/galaxy/commit/1cacdb76eb92927ed69b2ba0ae6af... Author: Nicola Soranzo <nicola.soranzo@gmail.com> Date: 2019-01-18 (Fri, 18 Jan 2019) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js Log Message: ----------- Apply suggestions from code review Co-Authored-By: dannon <dannon.baker@gmail.com> Commit: 67136670cf96ab19ffee3e8096b7e3bb3ad000bc https://github.com/galaxyproject/galaxy/commit/67136670cf96ab19ffee3e8096b7e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-01-18 (Fri, 18 Jan 2019) Changed paths: M client/galaxy/style/scss/overrides.scss M client/galaxy/style/scss/upload.scss Log Message: ----------- Adjust info message padding for uploader, convert nav-tabs margin from fixed pixels to ems Commit: 7742bed9c9f3246da8ccc4fcf1f6084116643fe4 https://github.com/galaxyproject/galaxy/commit/7742bed9c9f3246da8ccc4fcf1f60... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-01-18 (Fri, 18 Jan 2019) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-view.js Log Message: ----------- Leave a block element in upload-top-info for consistent spacing. The other three tabs already start with info there. Commit: ce113af1fc86650401f95bcdb90fa0d6927d3a57 https://github.com/galaxyproject/galaxy/commit/ce113af1fc86650401f95bcdb90fa... Author: Dannon <dannon.baker@gmail.com> Date: 2019-01-18 (Fri, 18 Jan 2019) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/scripts/mvc/upload/collection/rules-input-view.js M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/style/scss/overrides.scss M client/galaxy/style/scss/upload.scss Log Message: ----------- Merge pull request #7232 from guerler/upload_view_fixes Use regular font-size and styling in uploader Compare: https://github.com/galaxyproject/galaxy/compare/40003111b3cc...ce113af1fc86 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.