Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 365f4b374e3af4134b57144e9340676ac4f903a5 https://github.com/galaxyproject/galaxy/commit/365f4b374e3af4134b57144e93406... Author: anuprulez anup.rulez@gmail.com Date: 2016-04-13 (Wed, 13 Apr 2016)

Changed paths: M client/galaxy/scripts/mvc/ui/ui-select.js

Log Message: ----------- modifying getIndex method

Commit: b361ffa1c217a7e2c57a4d770b100ec718ca22b8 https://github.com/galaxyproject/galaxy/commit/b361ffa1c217a7e2c57a4d770b100... Author: anuprulez anup.rulez@gmail.com Date: 2016-04-13 (Wed, 13 Apr 2016)

Changed paths: M client/galaxy/scripts/mvc/ui/ui-select.js M static/maps/mvc/ui/ui-select.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/ui/ui-select.js

Log Message: ----------- removing old code from _getIndex method

Commit: 7f95786aef314a9484a5dab78d2883d9d42a8a43 https://github.com/galaxyproject/galaxy/commit/7f95786aef314a9484a5dab78d288... Author: anuprulez anup.rulez@gmail.com Date: 2016-05-12 (Thu, 12 May 2016)

Changed paths: M client/bower.json M client/galaxy/scripts/mvc/ui/ui-select.js M static/maps/mvc/ui/ui-select.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-select.js

Log Message: ----------- Adding latest Underscore.js dependency

Commit: e96b8bbf7afcfc58162b599a0e3d4e3d1fd0755a https://github.com/galaxyproject/galaxy/commit/e96b8bbf7afcfc58162b599a0e3d4... Author: anuprulez anup.rulez@gmail.com Date: 2016-05-12 (Thu, 12 May 2016)

Changed paths: M CONTRIBUTORS.md M Makefile M client/README.md M client/bower.json M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/libs/backbone.js M client/galaxy/scripts/libs/bootstrap-tour.js M client/galaxy/scripts/libs/d3.js M client/galaxy/scripts/libs/jquery/jquery.js M client/galaxy/scripts/libs/jquery/jquery.migrate.js M client/galaxy/scripts/libs/raven.js M client/galaxy/scripts/libs/require.js M client/galaxy/scripts/libs/tracekit.js M client/galaxy/scripts/libs/underscore.js M client/galaxy/scripts/mvc/citation/citation-model.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/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/history/history-model.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.js M client/galaxy/scripts/mvc/history/multi-panel.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-library-view.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/ui/popup-menu.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-options.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M client/galaxy/scripts/ui/hoverhighlight.js M client/galaxy/scripts/ui/loading-indicator.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/utils/localization.js M client/galaxy/scripts/utils/metrics-logger.js M client/galaxy/scripts/utils/utils.js M client/galaxy/style/less/ui.less M client/grunt-tasks/scripts.js M client/grunt-tasks/style.js M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M config/plugins/tours/core.galaxy_ui.yaml M config/plugins/tours/core.scratchbook.yaml M config/plugins/visualizations/charts/static/views/group.js R config/plugins/visualizations/graphview/config/graphview.xml R config/plugins/visualizations/graphview/static/graphview.css R config/plugins/visualizations/graphview/static/graphview.js R config/plugins/visualizations/graphview/static/jquery.rdfquery.core.js R config/plugins/visualizations/graphview/templates/graphview.mako M config/reports.ini.sample M config/tool_shed.ini.sample M lib/galaxy/config.py A lib/galaxy/datatypes/converters/ref_to_seq_taxonomy_converter.py A lib/galaxy/datatypes/converters/ref_to_seq_taxonomy_converter.xml M lib/galaxy/datatypes/data.py A lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.axes A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.filter A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.freq A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.lower.dist A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.map A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.oligos A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.otu A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.pair.dist A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.quan A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.ref.taxonomy A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.sabund A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.shared A lib/galaxy/datatypes/test/mothur_datatypetest_false.mothur.square.dist A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.axes A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.filter A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.freq A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.lower.dist A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.map A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.oligos A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.otu A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.pair.dist A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.quan A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.ref.taxonomy A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.sabund A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.shared A lib/galaxy/datatypes/test/mothur_datatypetest_true.mothur.square.dist M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conda-environment.txt M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/dependencies/pinned-hashed-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/dependencies/requirements.txt M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh 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/context.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/cwl/parser.py A lib/galaxy/tools/cwl/schema.py M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/errors.py M lib/galaxy/tools/lint.py M lib/galaxy/tools/linters/__init__.py M lib/galaxy/tools/linters/citations.py M lib/galaxy/tools/linters/command.py A lib/galaxy/tools/linters/general.py M lib/galaxy/tools/linters/help.py M lib/galaxy/tools/linters/inputs.py M lib/galaxy/tools/linters/outputs.py M lib/galaxy/tools/linters/stdio.py M lib/galaxy/tools/linters/tests.py R lib/galaxy/tools/linters/top_level.py M lib/galaxy/tools/linters/xml_order.py M lib/galaxy/tools/loader_directory.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parser/factory.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/search/__init__.py M lib/galaxy/tools/wrappers.py M lib/galaxy/util/__init__.py M lib/galaxy/util/sanitize_html.py M lib/galaxy/util/validation.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/web/framework/middleware/statsd.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/web/proxy/js/package.json M lib/galaxy/webapps/galaxy/api/datatypes.py M lib/galaxy/webapps/galaxy/api/remote_files.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/tool_runner.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/tool_shed/api/repository_revisions.py M lib/galaxy/webapps/tool_shed/api/users.py M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/galaxy/webapps/tool_shed/model/mapping.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M lib/tool_shed/capsule/capsule_manager.py M lib/tool_shed/dependencies/repository/relation_builder.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M lib/tool_shed/grids/repository_grids.py M lib/tool_shed/grids/util.py M lib/tool_shed/metadata/repository_metadata_manager.py M lib/tool_shed/repository_registry.py M lib/tool_shed/util/metadata_util.py M lib/tool_shed/util/repository_util.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/utility_containers/__init__.py M lib/tool_shed/utility_containers/utility_container_manager.py M static/maps/layout/page.js.map M static/maps/libs/backbone.js.map M static/maps/libs/bootstrap-tour.js.map M static/maps/libs/d3.js.map M static/maps/libs/jquery/jquery.js.map M static/maps/libs/jquery/jquery.migrate.js.map M static/maps/libs/raven.js.map M static/maps/libs/require.js.map M static/maps/libs/tracekit.js.map M static/maps/libs/underscore.js.map M static/maps/mvc/citation/citation-model.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/form/form-input.js.map M static/maps/mvc/form/form-parameters.js.map M static/maps/mvc/form/form-section.js.map M static/maps/mvc/history/history-model.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.js.map M static/maps/mvc/history/multi-panel.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-library-view.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/maps/mvc/tool/tool-form.js.map M static/maps/mvc/ui/popup-menu.js.map M static/maps/mvc/ui/ui-drilldown.js.map M static/maps/mvc/ui/ui-list.js.map M static/maps/mvc/ui/ui-misc.js.map M static/maps/mvc/ui/ui-options.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/maps/mvc/ui/ui-select.js.map M static/maps/mvc/workflow/workflow-terminals.js.map M static/maps/ui/hoverhighlight.js.map M static/maps/ui/loading-indicator.js.map M static/maps/ui/mode-button.js.map M static/maps/ui/pagination.js.map M static/maps/ui/peek-column-selector.js.map M static/maps/utils/localization.js.map M static/maps/utils/metrics-logger.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/page.js M static/scripts/libs/backbone.js M static/scripts/libs/bootstrap-tour.js M static/scripts/libs/d3.js M static/scripts/libs/jquery/jquery.js M static/scripts/libs/jquery/jquery.migrate.js M static/scripts/libs/raven.js M static/scripts/libs/require.js M static/scripts/libs/tracekit.js M static/scripts/libs/underscore.js M static/scripts/mvc/citation/citation-model.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/form/form-input.js M static/scripts/mvc/form/form-parameters.js M static/scripts/mvc/form/form-section.js M static/scripts/mvc/history/history-model.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.js M static/scripts/mvc/history/multi-panel.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-library-view.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/ui/popup-menu.js M static/scripts/mvc/ui/ui-drilldown.js M static/scripts/mvc/ui/ui-list.js M static/scripts/mvc/ui/ui-misc.js M static/scripts/mvc/ui/ui-options.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/ui/ui-select.js M static/scripts/mvc/workflow/workflow-terminals.js M static/scripts/ui/hoverhighlight.js M static/scripts/ui/loading-indicator.js M static/scripts/ui/mode-button.js M static/scripts/ui/pagination.js M static/scripts/ui/peek-column-selector.js M static/scripts/utils/localization.js M static/scripts/utils/metrics-logger.js M static/scripts/utils/utils.js M static/style/blue/base.css M templates/base/base_panels.mako M templates/display_base.mako M templates/sharing_base.mako M templates/show_params.mako A templates/slug_editing_js.mako M templates/webapps/galaxy/data_manager/view_job.mako M templates/webapps/galaxy/galaxy.masthead.mako M templates/webapps/galaxy/galaxy.panels.mako M templates/webapps/galaxy/history/display.mako M templates/webapps/galaxy/library/common/browse_library.mako M templates/webapps/galaxy/library/common/ldda_info.mako M templates/webapps/galaxy/workflow/display.mako M templates/webapps/galaxy/workflow/run.mako M templates/webapps/galaxy/workflow/sharing.mako M templates/webapps/tool_shed/index.mako M templates/webapps/tool_shed/repository/common.mako M templates/webapps/tool_shed/repository/manage_repository.mako M test/api/test_tools.py M test/api/workflows_format_2/converter.py M test/api/workflows_format_2/interface.py M test/api/workflows_format_2/main.py M test/base/interactor.py A test/functional/tools/multi_data_repeat.xml M test/functional/tools/samples_tool_conf.xml M test/integration/test_pulsar_embedded.py M test/qunit/test-common.js R test/qunit/test-libs/qunit-1.14.0.css R test/qunit/test-libs/qunit-1.14.0.js A test/qunit/test-libs/qunit-1.23.1.css A test/qunit/test-libs/qunit-1.23.1.js A test/qunit/test-libs/sinon-1.17.3.js R test/qunit/test-libs/sinon-1.9.1.js M test/qunit/tests/form_tests.js M test/qunit/tests/list-of-pairs-collection-creator.js M test/qunit/tests/metrics-logger.js M test/qunit/tests/page_tests.js M test/qunit/tests/ui_tests.html M test/qunit/tests/ui_tests.js A test/qunit/tests/utils_test.html A test/qunit/tests/utils_test.js M test/qunit/tests/workflow_editor_tests.js R test/shed_functional/functional/test_0450_skip_tool_tests.py M test/shed_functional/functional/test_0540_get_all_metadata_from_api.py A test/shed_functional/functional/test_0550_metadata_updated_dependencies.py A test/shed_functional/test_data/0550_files/filtering_1.0.tgz A test/shed_functional/test_data/0550_files/package_freebayes_1_0550.tgz A test/shed_functional/test_data/0550_files/package_freebayes_2_0550.tgz A test/shed_functional/test_data/0550_files/package_samtools_1_0550.tgz A test/shed_functional/test_data/0550_files/package_samtools_2_0550.tgz A test/shed_functional/test_data/0550_files/temp/tool_dependencies.xml M test/unit/test_objectstore.py M tools/data_source/biomart.xml M tools/data_source/upload.py M tools/filters/trimmer.xml M tools/stats/grouping.py M tools/stats/grouping.xml

Log Message: ----------- Adding changes for latest Underscore JS library

Commit: 4d6b8bf2b44a96d97b98fbc992ffc8518acb6a82 https://github.com/galaxyproject/galaxy/commit/4d6b8bf2b44a96d97b98fbc992ffc... Author: anuprulez anup.rulez@gmail.com Date: 2016-05-12 (Thu, 12 May 2016)

Changed paths: M client/bower.json

Log Message: ----------- reverting the version of underscore as it is already updated in the galaxy main

Commit: a144a32f403bad299793a494e0547483c5cb1322 https://github.com/galaxyproject/galaxy/commit/a144a32f403bad299793a494e0547... Author: Martin Cech cech.marten@gmail.com Date: 2016-05-17 (Tue, 17 May 2016)

Changed paths: M client/galaxy/scripts/mvc/ui/ui-select.js M static/maps/mvc/ui/ui-select.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-select.js

Log Message: ----------- Merge branch 'dev' of https://github.com/anuprulez/galaxy into anuprulez-dev

Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map

Compare: https://github.com/galaxyproject/galaxy/compare/c2ea4ee52663...a144a32f403b