Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 313c6a7247cedad288eab7879bc4ba162eff12ac https://github.com/galaxyproject/galaxy/commit/313c6a7247cedad288eab7879bc4b... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-01-15 (Fri, 15 Jan 2016)

Changed paths: M client/GruntFile.js M client/README.md M client/grunt-tasks/install-libs.js M client/package.json M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map

Log Message: ----------- Client-build, Webpack: add tasks to grunt for the common webpack tasks, update readme

Commit: 9f8cc9a13fa09390fb92291a33469f79ee49f889 https://github.com/galaxyproject/galaxy/commit/9f8cc9a13fa09390fb92291a33469... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-01-15 (Fri, 15 Jan 2016)

Changed paths: M .gitignore M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/base-mvc.js M client/galaxy/scripts/mvc/collection/collection-li-edit.js M client/galaxy/scripts/mvc/collection/collection-li.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/collection-view.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/dataset-choice.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/dataset/dataset-list.js M client/galaxy/scripts/mvc/dataset/dataset-model.js M client/galaxy/scripts/mvc/dataset/states.js M client/galaxy/scripts/mvc/form/form-data.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-repeat.js M client/galaxy/scripts/mvc/form/form-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-li.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-contents.js M client/galaxy/scripts/mvc/history/history-model.js M client/galaxy/scripts/mvc/history/history-structure-view.js M client/galaxy/scripts/mvc/history/history-view-annotated.js M client/galaxy/scripts/mvc/history/history-view-edit-current.js M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/history/history-view.js M client/galaxy/scripts/mvc/history/job-dag.js M client/galaxy/scripts/mvc/history/multi-panel.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/list/list-item.js M client/galaxy/scripts/mvc/list/list-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form-workflow.js M client/galaxy/scripts/mvc/ui/ui-list.js M client/galaxy/scripts/mvc/ui/ui-misc.js M client/galaxy/scripts/mvc/upload/default/default-row.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-quotameter.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/utils/utils.js M client/galaxy/style/less/ui.less M client/galaxy/style/less/upload.less A client/grunt-tasks/webpack.js M config/galaxy.ini.sample R config/plugins/interactive_environments/ipython/config/ipython.ini.sample R config/plugins/interactive_environments/ipython/config/ipython.xml R config/plugins/interactive_environments/ipython/static/js/ipython.js R config/plugins/interactive_environments/ipython/templates/ipython.mako R config/plugins/interactive_environments/ipython/templates/notebook.ipynb M config/plugins/tours/core.galaxy_ui.yaml M config/plugins/tours/core.history.yaml A config/plugins/tours/core.scratchbook.yaml R config/plugins/visualizations/charts/static/build-app.js M lib/galaxy/config.py M lib/galaxy/datatypes/tabular.py A lib/galaxy/dependencies/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh M lib/galaxy/jobs/runners/util/job_script/__init__.py M lib/galaxy/managers/rbac_secured.py M lib/galaxy/model/__init__.py M lib/galaxy/model/custom_types.py M lib/galaxy/model/migrate/versions/0052_sample_dataset_table.py M lib/galaxy/model/migrate/versions/0065_add_name_to_form_fields_and_values.py M lib/galaxy/model/migrate/versions/0067_populate_sequencer_table.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/cwl/cwltool_deps.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/output_collect.py M lib/galaxy/tools/parser/output_actions.py M lib/galaxy/tools/parser/output_collection_def.py M lib/galaxy/tools/test.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/panel.py M lib/galaxy/tools/toolbox/watcher.py M lib/galaxy/tools/wrappers.py M lib/galaxy/util/object_wrapper.py M lib/galaxy/util/pastescript/loadwsgi.py M lib/galaxy/visualization/genomes.py M lib/galaxy/web/framework/openid_manager.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/remote_files.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/workflow/extract.py M lib/pulsar/client/amqp_exchange.py M requirements.txt M run.sh M run_tests.sh M scripts/binary_compatibility.py M scripts/cleanup_datasets/admin_cleanup_datasets.py M scripts/common_startup.sh M static/maps/layout/menu.js.map M static/maps/mvc/base-mvc.js.map M static/maps/mvc/collection/collection-li-edit.js.map M static/maps/mvc/collection/collection-li.js.map M static/maps/mvc/collection/collection-model.js.map M static/maps/mvc/collection/collection-view-edit.js.map M static/maps/mvc/collection/collection-view.js.map M static/maps/mvc/collection/list-collection-creator.js.map M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/maps/mvc/collection/pair-collection-creator.js.map M static/maps/mvc/dataset/dataset-choice.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/dataset/dataset-li.js.map M static/maps/mvc/dataset/dataset-list.js.map M static/maps/mvc/dataset/dataset-model.js.map M static/maps/mvc/dataset/states.js.map M static/maps/mvc/form/form-data.js.map M static/maps/mvc/form/form-input.js.map M static/maps/mvc/form/form-parameters.js.map M static/maps/mvc/form/form-repeat.js.map M static/maps/mvc/form/form-view.js.map M static/maps/mvc/history/copy-dialog.js.map M static/maps/mvc/history/hda-li-edit.js.map M static/maps/mvc/history/hda-li.js.map M static/maps/mvc/history/hda-model.js.map M static/maps/mvc/history/hdca-li-edit.js.map M static/maps/mvc/history/hdca-li.js.map M static/maps/mvc/history/hdca-model.js.map M static/maps/mvc/history/history-content-model.js.map M static/maps/mvc/history/history-contents.js.map M static/maps/mvc/history/history-model.js.map M static/maps/mvc/history/history-structure-view.js.map M static/maps/mvc/history/history-view-annotated.js.map M static/maps/mvc/history/history-view-edit-current.js.map M static/maps/mvc/history/history-view-edit.js.map M static/maps/mvc/history/history-view.js.map M static/maps/mvc/history/job-dag.js.map M static/maps/mvc/history/multi-panel.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/list/list-item.js.map M static/maps/mvc/list/list-view.js.map M static/maps/mvc/tool/tool-form-workflow.js.map M static/maps/mvc/ui/ui-list.js.map M static/maps/mvc/ui/ui-misc.js.map M static/maps/mvc/upload/default/default-row.js.map M static/maps/mvc/upload/upload-settings.js.map M static/maps/mvc/user/user-model.js.map M static/maps/mvc/user/user-quotameter.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/maps/utils/utils.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/layout/menu.js M static/scripts/mvc/base-mvc.js M static/scripts/mvc/collection/collection-li-edit.js M static/scripts/mvc/collection/collection-li.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/collection/collection-view-edit.js M static/scripts/mvc/collection/collection-view.js M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/scripts/mvc/collection/pair-collection-creator.js M static/scripts/mvc/dataset/dataset-choice.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/dataset/dataset-li.js M static/scripts/mvc/dataset/dataset-list.js M static/scripts/mvc/dataset/dataset-model.js M static/scripts/mvc/dataset/states.js M static/scripts/mvc/form/form-data.js M static/scripts/mvc/form/form-input.js M static/scripts/mvc/form/form-parameters.js M static/scripts/mvc/form/form-repeat.js M static/scripts/mvc/form/form-view.js M static/scripts/mvc/history/hda-li-edit.js M static/scripts/mvc/history/hda-li.js M static/scripts/mvc/history/hda-model.js M static/scripts/mvc/history/hdca-li-edit.js M static/scripts/mvc/history/hdca-li.js M static/scripts/mvc/history/hdca-model.js M static/scripts/mvc/history/history-content-model.js M static/scripts/mvc/history/history-contents.js M static/scripts/mvc/history/history-model.js M static/scripts/mvc/history/history-structure-view.js M static/scripts/mvc/history/history-view-annotated.js M static/scripts/mvc/history/history-view-edit-current.js M static/scripts/mvc/history/history-view-edit.js M static/scripts/mvc/history/history-view.js M static/scripts/mvc/history/job-dag.js M static/scripts/mvc/history/multi-panel.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/list/list-item.js M static/scripts/mvc/list/list-view.js M static/scripts/mvc/tool/tool-form-workflow.js M static/scripts/mvc/ui/ui-list.js M static/scripts/mvc/ui/ui-misc.js M static/scripts/mvc/upload/default/default-row.js M static/scripts/mvc/upload/upload-settings.js M static/scripts/mvc/user/user-model.js M static/scripts/mvc/user/user-quotameter.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/utils/utils.js M static/style/blue/base.css M templates/webapps/reports/jobs_errors_per_tool.mako M templates/webapps/reports/jobs_per_month_all.mako M templates/webapps/reports/jobs_per_month_in_error.mako M templates/webapps/reports/jobs_per_tool.mako M templates/webapps/reports/jobs_per_user.mako M templates/webapps/reports/jobs_specified_month_all.mako M templates/webapps/reports/jobs_specified_month_in_error.mako M templates/webapps/reports/jobs_tool_per_month.mako M templates/webapps/reports/jobs_user_per_month.mako M templates/webapps/reports/registered_users_per_month.mako M templates/webapps/reports/requests_user_per_month.mako M templates/webapps/reports/users_last_access_date.mako M templates/webapps/reports/users_user_disk_usage.mako M templates/webapps/reports/workflows_per_month_all.mako M templates/webapps/reports/workflows_per_user.mako M templates/webapps/reports/workflows_per_workflow.mako M templates/webapps/reports/workflows_user_per_month.mako M test/api/helpers.py M test/api/test_tools.py M test/casperjs/casperjs_runner.py M test/casperjs/modules/user.js M test/functional/test_toolbox.py M test/functional/tools/output_action_change_format.xml M test/qunit/tests/masthead_tests.js A test/qunit/tests/ui_tests.html A test/qunit/tests/ui_tests.js M test/unit/jobs/test_command_factory.py M test/unit/jobs/test_runner_local.py M test/unit/tools/test_collect_primary_datasets.py M test/unit/tools/test_execution.py M test/unit/unittest_utils/galaxy_mock.py A test/unit/web/framework/__init__.py A test/unit/web/framework/test_webapp.py

Log Message: ----------- Client-build: add the webpack task file, merge dev

Commit: 10f7c901644519d2968b21bf843cb08acc9b489b https://github.com/galaxyproject/galaxy/commit/10f7c901644519d2968b21bf843cb... Author: John Chilton jmchilton@gmail.com Date: 2016-01-18 (Mon, 18 Jan 2016)

Changed paths: M client/GruntFile.js M client/README.md M client/grunt-tasks/install-libs.js A client/grunt-tasks/webpack.js M client/package.json M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map

Log Message: ----------- Merge pull request #1523 from carlfeberhard/grunt-webpack

Client-build, Webpack: add tasks to grunt for the common webpack tasks, update readme

Compare: https://github.com/galaxyproject/galaxy/compare/91f1a65cb149...10f7c9016445