Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 5a276ec3e69de63dc574759db59cd083c1b80b8b https://github.com/galaxyproject/galaxy/commit/5a276ec3e69de63dc574759db59cd... Author: Martin Cech marten@bx.psu.edu Date: 2017-10-26 (Thu, 26 Oct 2017)

Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.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-librarylist-view.js M client/galaxy/scripts/mvc/library/library-model.js A client/galaxy/scripts/mvc/library/library-util.js 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-librarylist-view.js.map M static/maps/mvc/library/library-model.js.map A static/maps/mvc/library/library-util.js.map M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-folderrow-view.js M static/scripts/mvc/library/library-librarylist-view.js M static/scripts/mvc/library/library-model.js A static/scripts/mvc/library/library-util.js

Log Message: ----------- start work on new lirbary comparators

Commit: 987f016246ebb5e7474c3e5f2bedeb38a8786e0e https://github.com/galaxyproject/galaxy/commit/987f016246ebb5e7474c3e5f2bede... Author: Martin Cech marten@bx.psu.edu Date: 2017-10-26 (Thu, 26 Oct 2017)

Changed paths: M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-util.js M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-util.js.map M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-util.js

Log Message: ----------- rework the comparator to work when key is missing from object

Commit: 8bde43214cbca1eb31958b4280e1bda93b43fd3a https://github.com/galaxyproject/galaxy/commit/8bde43214cbca1eb31958b4280e1b... Author: Martin Cech marten@bx.psu.edu Date: 2017-10-26 (Thu, 26 Oct 2017)

Changed paths: M client/galaxy/scripts/mvc/library/library-folderlist-view.js M static/maps/mvc/library/library-folderlist-view.js.map

Log Message: ----------- remove forgotten comment

Commit: c41225b422662a29aa7a43922beac2ffafd2a81b https://github.com/galaxyproject/galaxy/commit/c41225b422662a29aa7a43922beac... Author: Martin Cech marten@bx.psu.edu Date: 2017-10-27 (Fri, 27 Oct 2017)

Changed paths: 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-util.js 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-util.js.map M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-folderrow-view.js M static/scripts/mvc/library/library-util.js

Log Message: ----------- datalibs add func to sort folder by desc/state

refactor the comparator a bit to not change the actual obejcts' prperties

Commit: be4ddd3cd0acdd1d8049f23fbaff577447aaf78f https://github.com/galaxyproject/galaxy/commit/be4ddd3cd0acdd1d8049f23fbaff5... Author: Martin Cech marten@bx.psu.edu Date: 2017-10-27 (Fri, 27 Oct 2017)

Changed paths: M .travis.yml M Makefile M client/galaxy/scripts/mvc/tours.js M client/galaxy/style/less/base.less M client/gulpfile.js M client/package.json M client/yarn.lock M config/plugins/tours/core.galaxy_ui.yaml M config/plugins/tours/core.history.yaml M config/plugins/tours/core.scratchbook.yaml M doc/schema_template.md M lib/galaxy/managers/workflows.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/tours/__init__.py M lib/galaxy/util/path/ntpath.py M run_tests.sh M static/maps/mvc/tours.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js M static/style/blue/base.css M test/api/test_tools.py A test/functional/tools/data_source.py M test/functional/tools/samples_tool_conf.xml A test/functional/tools/test_data_source.xml M test/qunit/Gruntfile.js M test/qunit/package.json M test/qunit/test-app.js M test/qunit/test-common.js R test/qunit/test-libs/qunit-1.23.1.css R test/qunit/test-libs/qunit-1.23.1.js R test/qunit/test-libs/sinon-1.17.7.js R test/qunit/test-libs/sinon-qunit-1.0.0.js M test/qunit/tests/form_tests.js M test/qunit/tests/galaxy-app-base.js M test/qunit/tests/graph.js M test/qunit/tests/hda-base.js M test/qunit/tests/history_contents_model_tests.js M test/qunit/tests/job-dag.js M test/qunit/tests/list-of-pairs-collection-creator.js M test/qunit/tests/masthead_tests.js M test/qunit/tests/metrics-logger.js M test/qunit/tests/modal_tests.js M test/qunit/tests/page_tests.js M test/qunit/tests/popover_tests.js M test/qunit/tests/ui_tests.js M test/qunit/tests/upload_dialog_tests.js M test/qunit/tests/utils_test.js M test/qunit/tests/workflow_editor_tests.js M tox.ini

Log Message: ----------- Merge branch 'dev' into lib-comparators

Commit: 81a2163c87c28ae3ba4a3d4114a0c7e1c28441c6 https://github.com/galaxyproject/galaxy/commit/81a2163c87c28ae3ba4a3d4114a0c... Author: Martin Cech marten@bx.psu.edu Date: 2017-10-27 (Fri, 27 Oct 2017)

Changed paths: M static/scripts/bundled/libs.bundled.js.map

Log Message: ----------- repack

Commit: 62637405b591b8b9dc1d061bd7d19055cb363c8d https://github.com/galaxyproject/galaxy/commit/62637405b591b8b9dc1d061bd7d19... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-10-30 (Mon, 30 Oct 2017)

Changed paths: 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-librarylist-view.js M client/galaxy/scripts/mvc/library/library-model.js A client/galaxy/scripts/mvc/library/library-util.js 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-librarylist-view.js.map M static/maps/mvc/library/library-model.js.map A static/maps/mvc/library/library-util.js.map M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-folderrow-view.js M static/scripts/mvc/library/library-librarylist-view.js M static/scripts/mvc/library/library-model.js A static/scripts/mvc/library/library-util.js

Log Message: ----------- Merge pull request #4877 from martenson/lib-comparators

add sorting options for data library folders

Compare: https://github.com/galaxyproject/galaxy/compare/9257e93faf9b...62637405b591