Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 051a3173fcffb0fe682bc5c0d692b77855c37a53
https://github.com/galaxyproject/galaxy/commit/051a3173fcffb0fe682bc5c0d692…
Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M config/datatypes_conf.xml.sample
M lib/galaxy/datatypes/assembly.py
M lib/galaxy/datatypes/binary.py
Log Message:
-----------
Fix some datatype issues
- dmnd had a wrong class name
- biom1, cool and postgresql shouldn't have `subclass="true"`
- extension should be lowercase
- add missing file_ext attribute to various datatype classes
Commit: 743d5a37e8d4e35313fa872f4afe6ea616cfa36c
https://github.com/galaxyproject/galaxy/commit/743d5a37e8d4e35313fa872f4afe…
Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/sniff.py
Log Message:
-----------
Fix append_to_sniff_order()
`isinstance()` was leaving out e.g. the BigWig datatype because BigBed,
which was added first, is a subclass of BigWig.
Instead, add a datatype only if it is not already in `sniff_order`, it
has a `sniff()` method and was not defined with `subclass="true"`.
Commit: 0e0acb5200720cddaaff32bddf71c65f6cfe777e
https://github.com/galaxyproject/galaxy/commit/0e0acb5200720cddaaff32bddf71…
Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M lib/galaxy/datatypes/annotation.py
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/constructive_solid_geometry.py
M lib/galaxy/datatypes/images.py
M lib/galaxy/datatypes/proteomics.py
M lib/galaxy/datatypes/sequence.py
M lib/galaxy/datatypes/sniff.py
M lib/galaxy/datatypes/triples.py
M lib/galaxy/tools/actions/upload_common.py
M lib/galaxy/tools/parameters/grouping.py
M lib/galaxy/util/image_util.py
M tools/data_source/data_source.py
M tools/data_source/upload.py
Log Message:
-----------
Remove is_multi_byte from upload.py
Also, when sniffing binary files, sniff images together with the other
formats and respect sniff order.
Also remove `is_multi_byte` from:
- `stream_to_open_named_file()`
- `stream_to_file()`
Remove the now unused `get_image_ext()` and `Binary.is_sniffable_binary()`
and all the calls to `Binary.register_sniffable_binary_format()`.
Commit: fea6ddeeca7ccf89f1cacf9bcf49bfa18d16ad83
https://github.com/galaxyproject/galaxy/commit/fea6ddeeca7ccf89f1cacf9bcf49…
Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M lib/galaxy/dependencies/conda-environment.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/model/__init__.py
R lib/galaxy/util/multi_byte.py
Log Message:
-----------
Remove last remnants of is_multi_byte, drop wchartype dependency
Commit: f70e6f5627bc1f1e9398b9e88d398292d8e08998
https://github.com/galaxyproject/galaxy/commit/f70e6f5627bc1f1e9398b9e88d39…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M config/datatypes_conf.xml.sample
M lib/galaxy/datatypes/annotation.py
M lib/galaxy/datatypes/assembly.py
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/constructive_solid_geometry.py
M lib/galaxy/datatypes/images.py
M lib/galaxy/datatypes/proteomics.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/sequence.py
M lib/galaxy/datatypes/sniff.py
M lib/galaxy/datatypes/triples.py
M lib/galaxy/dependencies/conda-environment.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/model/__init__.py
M lib/galaxy/tools/actions/upload_common.py
M lib/galaxy/tools/parameters/grouping.py
M lib/galaxy/util/image_util.py
R lib/galaxy/util/multi_byte.py
M tools/data_source/data_source.py
M tools/data_source/upload.py
Log Message:
-----------
Merge pull request #5088 from nsoranzo/remove_wchartype_dep
Remove wchartype dependency and is_multi_byte [2/2]
Compare: https://github.com/galaxyproject/galaxy/compare/1b4d8e5b9a51...f70e6f5627bc
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 58b9767d179cd7e877f6cc8e637f1859d8dd5138
https://github.com/galaxyproject/galaxy/commit/58b9767d179cd7e877f6cc8e637f…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M client/galaxy/scripts/qunit/tests/modal_tests.js
M client/karma.config.js
Log Message:
-----------
Fixup modal_tests.js
Disable jQuery FX instead of mocking time - mocking time with sinon seems to not be working :(. Tests are conceptually cleaner this way IMO anyway.
Commit: 2983a04e999193c1a250b1d6aaf9ed67a40536fa
https://github.com/galaxyproject/galaxy/commit/2983a04e999193c1a250b1d6aaf9…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M client/galaxy/scripts/qunit/tests/form_tests.js
M client/karma.config.js
Log Message:
-----------
Re-enable form qunit tests.
Commit: 2f2ee90c6c103f39db716aaabb38297f0e53d540
https://github.com/galaxyproject/galaxy/commit/2f2ee90c6c103f39db716aaabb38…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M client/galaxy/scripts/qunit/tests/masthead_tests.js
M client/karma.config.js
Log Message:
-----------
Re-enable masthead tests.
Commit: f0dc1e4f7a5a36bd1a01bbc938e27db97301663f
https://github.com/galaxyproject/galaxy/commit/f0dc1e4f7a5a36bd1a01bbc938e2…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
R client/galaxy/scripts/qunit/tests/galaxy-app-base.js
A client/galaxy/scripts/qunit/tests/galaxy_app_base_tests.js
R client/galaxy/scripts/qunit/tests/graph.js
A client/galaxy/scripts/qunit/tests/graph_tests.js
R client/galaxy/scripts/qunit/tests/hda-base.js
A client/galaxy/scripts/qunit/tests/hda_base_tests.js
R client/galaxy/scripts/qunit/tests/job-dag.js
A client/galaxy/scripts/qunit/tests/job_dag_tests.js
R client/galaxy/scripts/qunit/tests/list-of-pairs-collection-creator.js
A client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js
R client/galaxy/scripts/qunit/tests/metrics-logger.js
A client/galaxy/scripts/qunit/tests/metrics_logger_tests.js
R client/galaxy/scripts/qunit/tests/utils_test.js
A client/galaxy/scripts/qunit/tests/utils_tests.js
M client/karma.config.js
Log Message:
-----------
Rename qunit test files for consistency.
Commit: 364e4518a833a77b977b8b48392e86e8833fe091
https://github.com/galaxyproject/galaxy/commit/364e4518a833a77b977b8b48392e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M client/galaxy/scripts/qunit/test.js
Log Message:
-----------
In qunit single pack mode - enumerate the files to figure out the problems.
Commit: 4270a7b0e39e36a8177dc596b839355eac115035
https://github.com/galaxyproject/galaxy/commit/4270a7b0e39e36a8177dc596b839…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js
Log Message:
-----------
Fix a missing server.restore in a test case.
Commit: 395a6c3a5f5f2c1ed24b17b7b6f6753625d3e4b7
https://github.com/galaxyproject/galaxy/commit/395a6c3a5f5f2c1ed24b17b7b6f6…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M client/package.json
Log Message:
-----------
Switch qunit testing to producing a single webpack bundle.
I think a lot of the remaining issues stem from attempting to load multiple bundles in the same web browser window - repeatedly loading jQuery, select2, etc.... This variant is much closer to running all the tests in a seemingly more flexible order and I've never seen a select2 problem this way.
Commit: 930ac1ab796a7d4414d6c573c752d9dcc07f4de2
https://github.com/galaxyproject/galaxy/commit/930ac1ab796a7d4414d6c573c752…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M client/galaxy/scripts/qunit/tests/form_tests.js
M client/galaxy/scripts/qunit/tests/galaxy_app_base_tests.js
M client/galaxy/scripts/qunit/tests/graph_tests.js
M client/galaxy/scripts/qunit/tests/hda_base_tests.js
M client/galaxy/scripts/qunit/tests/history_contents_model_tests.js
M client/galaxy/scripts/qunit/tests/job_dag_tests.js
M client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js
M client/galaxy/scripts/qunit/tests/masthead_tests.js
M client/galaxy/scripts/qunit/tests/metrics_logger_tests.js
M client/galaxy/scripts/qunit/tests/modal_tests.js
M client/galaxy/scripts/qunit/tests/page_tests.js
M client/galaxy/scripts/qunit/tests/popover_tests.js
M client/galaxy/scripts/qunit/tests/ui_tests.js
M client/galaxy/scripts/qunit/tests/upload_dialog_tests.js
M client/galaxy/scripts/qunit/tests/utils_tests.js
M client/galaxy/scripts/qunit/tests/workflow_editor_tests.js
Log Message:
-----------
Convert qunit tests to ES6.
... and make client-format them.
Commit: 4769a98ea0db663b33465de48485f69965e39da8
https://github.com/galaxyproject/galaxy/commit/4769a98ea0db663b33465de48485…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M client/galaxy/scripts/qunit/test.js
M client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js
Log Message:
-----------
Comment out the one failing qunit test.
Commit: 1b4d8e5b9a518a9116168added511a099ac1acf4
https://github.com/galaxyproject/galaxy/commit/1b4d8e5b9a518a9116168added51…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/qunit/test.js
M client/galaxy/scripts/qunit/tests/form_tests.js
R client/galaxy/scripts/qunit/tests/galaxy-app-base.js
A client/galaxy/scripts/qunit/tests/galaxy_app_base_tests.js
R client/galaxy/scripts/qunit/tests/graph.js
A client/galaxy/scripts/qunit/tests/graph_tests.js
R client/galaxy/scripts/qunit/tests/hda-base.js
A client/galaxy/scripts/qunit/tests/hda_base_tests.js
M client/galaxy/scripts/qunit/tests/history_contents_model_tests.js
R client/galaxy/scripts/qunit/tests/job-dag.js
A client/galaxy/scripts/qunit/tests/job_dag_tests.js
R client/galaxy/scripts/qunit/tests/list-of-pairs-collection-creator.js
A client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js
M client/galaxy/scripts/qunit/tests/masthead_tests.js
R client/galaxy/scripts/qunit/tests/metrics-logger.js
A client/galaxy/scripts/qunit/tests/metrics_logger_tests.js
M client/galaxy/scripts/qunit/tests/modal_tests.js
M client/galaxy/scripts/qunit/tests/page_tests.js
M client/galaxy/scripts/qunit/tests/popover_tests.js
M client/galaxy/scripts/qunit/tests/ui_tests.js
M client/galaxy/scripts/qunit/tests/upload_dialog_tests.js
R client/galaxy/scripts/qunit/tests/utils_test.js
A client/galaxy/scripts/qunit/tests/utils_tests.js
M client/galaxy/scripts/qunit/tests/workflow_editor_tests.js
M client/karma.config.js
M client/package.json
Log Message:
-----------
Merge pull request #5074 from jmchilton/qunit_fixes
More QUnit Fixes and Enhancements
Compare: https://github.com/galaxyproject/galaxy/compare/1385cf4f83ac...1b4d8e5b9a51
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: ca2eb5b2a5a3b4e9a026806dc5f228fcce681379
https://github.com/galaxyproject/galaxy/commit/ca2eb5b2a5a3b4e9a026806dc5f2…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-24 (Fri, 24 Nov 2017)
Changed paths:
M test/functional/tools/bibtex.xml
M test/functional/tools/samples_tool_conf.xml
M test/galaxy_selenium/navigation.yml
M test/galaxy_selenium/smart_components.py
M test/selenium_tests/test_tool_form.py
Log Message:
-----------
Simple tool test for citations.
Commit: b3d06f481a5fa6c649cb1ea6709038041566b9c5
https://github.com/galaxyproject/galaxy/commit/b3d06f481a5fa6c649cb1ea67090…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-24 (Fri, 24 Nov 2017)
Changed paths:
M client/galaxy/scripts/components/citations.vue
Log Message:
-----------
Restore classes on citation switching buttons.
Commit: 95c0ff6bf9ae19374eb660731e42370157c366c6
https://github.com/galaxyproject/galaxy/commit/95c0ff6bf9ae19374eb660731e42…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-24 (Fri, 24 Nov 2017)
Changed paths:
M static/scripts/bundled/admin.bundled.js
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/masthead.bundled.js
M static/scripts/bundled/viz.bundled.js
M static/scripts/bundled/workflow.bundled.js
Log Message:
-----------
Repack client.
Commit: 05ddc50c1a7b0989e100e7ca817a96bad3d68ad7
https://github.com/galaxyproject/galaxy/commit/05ddc50c1a7b0989e100e7ca817a…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-24 (Fri, 24 Nov 2017)
Changed paths:
M test/selenium_tests/test_tool_form.py
Log Message:
-----------
Make test more robust - citations take a while to fetch from doi.
Commit: bb7d06f59ed20fcbef7ad36d06a1ec138fac7e96
https://github.com/galaxyproject/galaxy/commit/bb7d06f59ed20fcbef7ad36d06a1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-25 (Sat, 25 Nov 2017)
Changed paths:
M test/selenium_tests/test_tool_form.py
Log Message:
-----------
Pre-fetch citations in new test so available quickly at render time.
Commit: d8fe56c670ec78bb00e70d56cf59a895a1b8418b
https://github.com/galaxyproject/galaxy/commit/d8fe56c670ec78bb00e70d56cf59…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-27 (Mon, 27 Nov 2017)
Changed paths:
M test/selenium_tests/test_tool_form.py
Log Message:
-----------
Modify citations test to clarify some bugs.
Commit: 1385cf4f83ac508b997ca0cd2a3e893c69b84408
https://github.com/galaxyproject/galaxy/commit/1385cf4f83ac508b997ca0cd2a3e…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/components/Citations.vue
M static/scripts/bundled/admin.bundled.js
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/masthead.bundled.js
M static/scripts/bundled/viz.bundled.js
M static/scripts/bundled/workflow.bundled.js
M test/functional/tools/bibtex.xml
M test/functional/tools/samples_tool_conf.xml
M test/galaxy_selenium/navigation.yml
M test/selenium_tests/test_tool_form.py
Log Message:
-----------
Merge remote-tracking branch 'jmchilton/citations' into dev
Compare: https://github.com/galaxyproject/galaxy/compare/5124c5610900...1385cf4f83ac
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: cd91e8d85cb98b4bbdb35c569c1a3047933439a8
https://github.com/galaxyproject/galaxy/commit/cd91e8d85cb98b4bbdb35c569c1a…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/viz/trackster.js
M static/scripts/bundled/admin.bundled.js
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/masthead.bundled.js
M static/scripts/bundled/viz.bundled.js
M static/scripts/viz/trackster.js
Log Message:
-----------
Fix trackster link to custom builds view
Commit: 5124c561090013f84d78232218a325199215fa41
https://github.com/galaxyproject/galaxy/commit/5124c561090013f84d78232218a3…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/viz/trackster.js
M static/scripts/bundled/admin.bundled.js
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/masthead.bundled.js
M static/scripts/bundled/viz.bundled.js
M static/scripts/viz/trackster.js
Log Message:
-----------
Merge branch 'fix_trackster_link' into dev
Compare: https://github.com/galaxyproject/galaxy/compare/0c97e1158ea5...5124c5610900
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 78df0e2cc5c1118184a64fb8ea122844cca1d402
https://github.com/galaxyproject/galaxy/commit/78df0e2cc5c1118184a64fb8ea12…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M test/api/test_dataset_collections.py
M test/base/populators.py
Log Message:
-----------
Refactor populators for easier nested collection creation.
Commit: d0e9a80c58d08eadafb966ce9736dd595ec2dc82
https://github.com/galaxyproject/galaxy/commit/d0e9a80c58d08eadafb966ce9736…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M test/galaxy_selenium/components.py
M test/galaxy_selenium/has_driver.py
M test/galaxy_selenium/navigates_galaxy.py
M test/galaxy_selenium/navigation.yml
M test/galaxy_selenium/smart_components.py
M test/selenium_tests/test_history_multi_view.py
M test/selenium_tests/test_history_panel_collections.py
Log Message:
-----------
More GUI tests for collections.
Commit: 1c3d49b07a3b790cc4b7d418415d223c05956584
https://github.com/galaxyproject/galaxy/commit/1c3d49b07a3b790cc4b7d418415d…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-model.js
M client/galaxy/scripts/mvc/history/hdca-model.js
Log Message:
-----------
Refactor client collections - collapse List and Paired models.
They don't have different functionality - they shouldn't be different.
Commit: adef3a6a59fcc5395350519f146e010c9409a04c
https://github.com/galaxyproject/galaxy/commit/adef3a6a59fcc5395350519f146e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-model.js
M client/galaxy/scripts/mvc/history/hdca-model.js
Log Message:
-----------
Refactor client collections - rename List -> Flat at lowest level models.
It represents both lists and paireds now.
Commit: e70a7748565897832e20119735f5bcd38e56a15c
https://github.com/galaxyproject/galaxy/commit/e70a7748565897832e20119735f5…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-model.js
M client/galaxy/scripts/mvc/history/hdca-model.js
Log Message:
-----------
Refactor client collections - collapse nested paireds model into nested lists.
Commit: ba111325437473995dfd6dc5b82378d6ca8f32cd
https://github.com/galaxyproject/galaxy/commit/ba111325437473995dfd6dc5b823…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-model.js
M client/galaxy/scripts/mvc/history/hdca-model.js
Log Message:
-----------
Refactor client collections - rename listoflists model to nested model.
Commit: a5513a4868ca5229348189d1b0ff4a4801ef0863
https://github.com/galaxyproject/galaxy/commit/a5513a4868ca5229348189d1b0ff…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/history/hdca-model.js
M client/galaxy/scripts/mvc/history/history-contents.js
Log Message:
-----------
Refactor client collections - eliminate class distinction between history bound nested collections.
Commit: 0c1e6e46b20222912f35380d7f45aeeb0aa75778
https://github.com/galaxyproject/galaxy/commit/0c1e6e46b20222912f35380d7f45…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
Log Message:
-----------
Refactor client collections - eliminate class distinction between flat view edit collections.
Commit: 1535a0f01803c19d8db7f4035832ae1109bcbefe
https://github.com/galaxyproject/galaxy/commit/1535a0f01803c19d8db7f4035832…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
Log Message:
-----------
Refactor client collections - renamed list collection edit to flat.
Since it represents boths lists and paireds now.
Commit: 957ff9d0269b55a16095d3f94679d8e464df9dfc
https://github.com/galaxyproject/galaxy/commit/957ff9d0269b55a16095d3f94679…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Refactor client collections - eliminate class distinction between flat view collections.
Commit: dd13193fc40ade2203503a926c4dd479936a91e0
https://github.com/galaxyproject/galaxy/commit/dd13193fc40ade2203503a926c4d…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Refactor client collections - renamed list collection to flat.
Commit: b9bd5287d08f1a7a4b252af21a20e8115f216dec
https://github.com/galaxyproject/galaxy/commit/b9bd5287d08f1a7a4b252af21a20…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Refactor client collections - eliminate ListOfPairsCollectionView.
Just use ListOfListsCollectionView.
Commit: 897ff7e54ef6935a190de4974c7004d089477db3
https://github.com/galaxyproject/galaxy/commit/897ff7e54ef6935a190de4974c70…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
Log Message:
-----------
Refactor client collections - eliminate class distinction between nested view edit collections.
Commit: fdfa725a8b70d2182acfb3c971f34fd12bdded98
https://github.com/galaxyproject/galaxy/commit/fdfa725a8b70d2182acfb3c971f3…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
M client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
M client/galaxy/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Refactor client collections - rename nested collection views.
Both edit and RO variants - to reflect new generality.
Commit: 5a7eea6a810c15ca7175e7de86b136b355063007
https://github.com/galaxyproject/galaxy/commit/5a7eea6a810c15ca7175e7de86b1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
Log Message:
-----------
Refactor client collections - rename NestedPairCollectionViewEdit
... to NestedCollectionElementViewEdit since it isn't just used for paired collection contents and hasn't been for some time.
Commit: bcf0fb11e98a58224a33fabf1024b99f30262b89
https://github.com/galaxyproject/galaxy/commit/bcf0fb11e98a58224a33fabf1024…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-model.js
Log Message:
-----------
Refactor client collections - eliminate incorrect comments.
Commit: 1afd6e136f73db6116c6126412a80c80d35d1ea0
https://github.com/galaxyproject/galaxy/commit/1afd6e136f73db6116c6126412a8…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-model.js
M client/galaxy/scripts/mvc/history/hdca-model.js
Log Message:
-----------
Refactor client collections - eliminate Flat vs Nested dataset collection.
Just dispatch on collection type to determine collection contents.
Commit: 200cf96c2dda2ca5a353e78fcf54a3f1a024fcdc
https://github.com/galaxyproject/galaxy/commit/200cf96c2dda2ca5a353e78fcf54…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
M client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
M client/galaxy/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Refactor client collections - eliminate FlatCollectionView & FlatCollectionViewEdit.
These just did the same thing as CollectionView and CollectionViewEdit.
Commit: 4db301a9ab36852bd066d82bfe91f182343ec5fb
https://github.com/galaxyproject/galaxy/commit/4db301a9ab36852bd066d82bfe91…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
M client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
M client/galaxy/scripts/mvc/history/hdca-li.js
Log Message:
-----------
Refactor client collections - eliminate NestedCollectionView and NestedCollectionViewEdit.
They are just CollectionViews now.
Commit: a3cc810e93018744607fc6120d43f71ebaa52d0e
https://github.com/galaxyproject/galaxy/commit/a3cc810e93018744607fc6120d43…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-model.js
Log Message:
-----------
Refactor client collections - eliminated another class without a distinction.
Commit: ef81006c451e6e59bf23d8c9cc1c7714fae97505
https://github.com/galaxyproject/galaxy/commit/ef81006c451e6e59bf23d8c9cc1c…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
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/history/hdca-model.js
M client/galaxy/scripts/mvc/history/history-contents.js
Log Message:
-----------
Refactor client collections - eliminate all history bound collection distinctions.
Commit: eb735357e7b7f37b9601ef21f9c71a910c019a11
https://github.com/galaxyproject/galaxy/commit/eb735357e7b7f37b9601ef21f9c7…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
Log Message:
-----------
Refactor client collections - eliminate unneeded subclass of CollectionView.
Commit: 4defaa2188993450e0aa044e7316121d664c89b7
https://github.com/galaxyproject/galaxy/commit/4defaa2188993450e0aa044e7316…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
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/form/form-wrapper.js
M client/galaxy/scripts/mvc/history/hdca-model.js
Log Message:
-----------
Reformat client.
Commit: c6bc1538be4d06aa3c7df84066ffc3e33548ab22
https://github.com/galaxyproject/galaxy/commit/c6bc1538be4d06aa3c7df84066ff…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M test/selenium_tests/test_history_panel_collections.py
Log Message:
-----------
Mark one of the new history collection tests as @flakey.
Reason noted in PR.
Commit: 307d33ada15f1afe49d784df14d9fbcaf7178db1
https://github.com/galaxyproject/galaxy/commit/307d33ada15f1afe49d784df14d9…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M static/scripts/bundled/analysis.bundled.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/pair-collection-creator.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-contents.js
Log Message:
-----------
Repack.
Commit: 0c97e1158ea51128c9a0277aeccebb2a397a2f16
https://github.com/galaxyproject/galaxy/commit/0c97e1158ea51128c9a0277aecce…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
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/form/form-wrapper.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-contents.js
M static/scripts/bundled/analysis.bundled.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/pair-collection-creator.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-contents.js
M test/api/test_dataset_collections.py
M test/base/populators.py
M test/galaxy_selenium/components.py
M test/galaxy_selenium/has_driver.py
M test/galaxy_selenium/navigates_galaxy.py
M test/galaxy_selenium/navigation.yml
M test/galaxy_selenium/smart_components.py
M test/selenium_tests/test_history_multi_view.py
M test/selenium_tests/test_history_panel_collections.py
Log Message:
-----------
Merge pull request #5038 from jmchilton/unwind_collection_client
Render arbitrarily nested lists in the UI
Compare: https://github.com/galaxyproject/galaxy/compare/5e17e44db533...0c97e1158ea5
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 3c0ffb0ce9e5cf0939abf7abed5f664e7b0b80b7
https://github.com/galaxyproject/galaxy/commit/3c0ffb0ce9e5cf0939abf7abed5f…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-22 (Wed, 22 Nov 2017)
Changed paths:
M Makefile
M client/gulpfile.js
M client/package.json
M client/webpack.config.js
Log Message:
-----------
Separate dev and production builds.
Commit: 8a91ba848e8dab85fdf3d10716d3f7286ebc0823
https://github.com/galaxyproject/galaxy/commit/8a91ba848e8dab85fdf3d10716d3…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-22 (Wed, 22 Nov 2017)
Changed paths:
R static/maps/galaxy.library.js.map
R static/maps/layout/panel.js.map
R static/maps/mvc/citation/citation-model.js.map
R static/maps/mvc/citation/citation-view.js.map
R static/maps/mvc/citations.js.map
R static/maps/mvc/history/options-menu.js.map
R static/maps/mvc/library/library-folderlist-view.js.map
R static/maps/mvc/library/library-foldertoolbar-view.js.map
R static/maps/mvc/library/library-libraryrow-view.js.map
R static/maps/mvc/tool/tool-form-base.js.map
R static/maps/mvc/user/user_api_keys.js.map
Log Message:
-----------
Strip maps left behind previously.
Commit: 5e2c73801143e0cf1735bfcd15ac7746967cc0dd
https://github.com/galaxyproject/galaxy/commit/5e2c73801143e0cf1735bfcd15ac…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-22 (Wed, 22 Nov 2017)
Changed paths:
M client/package.json
Log Message:
-----------
Reapply accidentally dropped -p flag on default webpack invocation.
Commit: 35f08be9c828046b62c3e6889244ff12f647c7c6
https://github.com/galaxyproject/galaxy/commit/35f08be9c828046b62c3e6889244…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-22 (Wed, 22 Nov 2017)
Changed paths:
M client/package.json
Log Message:
-----------
Slight refactoring in package.json to standardize with 'dev' being the common, default option and 'production' being the non-default (logic being a build system should be the thing remembering extra options over the default)
Commit: 06af0175cba55d64aef3bdc0f812a41cfd2dceb5
https://github.com/galaxyproject/galaxy/commit/06af0175cba55d64aef3bdc0f812…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-22 (Wed, 22 Nov 2017)
Changed paths:
M client/package.json
Log Message:
-----------
Drop production-watch package script.
Commit: 97b9eed8afef5433163859fd216d3d40c67671aa
https://github.com/galaxyproject/galaxy/commit/97b9eed8afef5433163859fd216d…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-29 (Wed, 29 Nov 2017)
Changed paths:
M .gitignore
R static/scripts/bundled/admin.bundled.js.map
R static/scripts/bundled/adminToolshed.bundled.js.map
R static/scripts/bundled/analysis.bundled.js.map
R static/scripts/bundled/library.bundled.js.map
R static/scripts/bundled/libs.bundled.js.map
R static/scripts/bundled/login.bundled.js.map
R static/scripts/bundled/masthead.bundled.js.map
R static/scripts/bundled/viz.bundled.js.map
R static/scripts/bundled/workflow.bundled.js.map
Log Message:
-----------
More straggler maps (from bundles)
Commit: a36542a72b12796b27be3d4c7ed57f35d8533e1a
https://github.com/galaxyproject/galaxy/commit/a36542a72b12796b27be3d4c7ed5…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-29 (Wed, 29 Nov 2017)
Changed paths:
M client/gulpfile.js
M client/package.json
M client/webpack.config.js
Log Message:
-----------
Add production + sourcemaps build targets. Not as granular as I want, but SourceMapDevTool has weird interactions with -p
Commit: 0417699825174666bc8bb720c313c608bc4d8dbe
https://github.com/galaxyproject/galaxy/commit/0417699825174666bc8bb720c313…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-29 (Wed, 29 Nov 2017)
Changed paths:
M .travis.yml
M Makefile
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/panels/tool-panel.js
A client/galaxy/scripts/components/history-import.vue
M client/galaxy/scripts/layout/menu.js
M client/galaxy/scripts/mvc/form/form-wrapper.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/tag.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/mvc/workflow/workflow.js
A client/galaxy/scripts/qunit/test.js
M client/galaxy/style/less/ui.less
M client/karma.config.js
M client/package.json
M config/datatypes_conf.xml.sample
M config/error_report.yml.sample
M config/workflow_schedulers_conf.xml.sample
M lib/galaxy/app.py
M lib/galaxy/config.py
M lib/galaxy/datatypes/annotation.py
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/blast.py
M lib/galaxy/datatypes/constructive_solid_geometry.py
M lib/galaxy/datatypes/data.py
M lib/galaxy/datatypes/genetics.py
M lib/galaxy/datatypes/graph.py
M lib/galaxy/datatypes/images.py
M lib/galaxy/datatypes/molecules.py
M lib/galaxy/datatypes/msa.py
M lib/galaxy/datatypes/plant_tribes.py
M lib/galaxy/datatypes/proteomics.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/sequence.py
M lib/galaxy/datatypes/sniff.py
M lib/galaxy/datatypes/tabular.py
A lib/galaxy/datatypes/test/454Score.pdf
A lib/galaxy/datatypes/test/linkstudies.allegro_fparam
A lib/galaxy/datatypes/test/linkstudies.alohomora_gts
A lib/galaxy/datatypes/test/linkstudies.linkage_datain
A lib/galaxy/datatypes/test/linkstudies.linkage_map
M lib/galaxy/datatypes/text.py
M lib/galaxy/datatypes/triples.py
M lib/galaxy/datatypes/xml.py
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/handler.py
M lib/galaxy/jobs/manager.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/jobs/runners/state_handlers/resubmit.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/metadata.py
M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py
M lib/galaxy/model/orm/scripts.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/actions/history_imp_exp.py
M lib/galaxy/tools/actions/metadata.py
M lib/galaxy/tools/actions/model_operations.py
M lib/galaxy/tools/actions/upload_common.py
M lib/galaxy/tools/error_reports/plugins/sentry.py
M lib/galaxy/tools/imp_exp/imp_history_from_archive.xml
M lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py
M lib/galaxy/tools/verify/__init__.py
M lib/galaxy/util/compression_utils.py
A lib/galaxy/util/facts.py
M lib/galaxy/util/handlers.py
M lib/galaxy/util/path/__init__.py
M lib/galaxy/util/properties.py
M lib/galaxy/web/form_builder.py
M lib/galaxy/web/framework/webapp.py
M lib/galaxy/web/stack/__init__.py
A lib/galaxy/web/stack/message.py
A lib/galaxy/web/stack/transport.py
M lib/galaxy/webapps/galaxy/api/histories.py
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/webapps/tool_shed/config.py
M lib/galaxy/workflow/scheduling_manager.py
M lib/tool_shed/galaxy_install/migrate/check.py
M lib/tool_shed/util/commit_util.py
M lib/tool_shed/util/tool_util.py
R manage_tools.sh
M run.sh
M run_reports.sh
M run_tool_shed.sh
M scripts/common_startup_functions.sh
M scripts/galaxy-main
A scripts/get_uwsgi_args.py
R scripts/manage_tools.py
M static/scripts/bundled/admin.bundled.js
M static/scripts/bundled/adminToolshed.bundled.js
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/library.bundled.js
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/masthead.bundled.js
M static/scripts/bundled/viz.bundled.js
M static/scripts/bundled/workflow.bundled.js
M static/scripts/layout/menu.js
M static/scripts/mvc/form/form-wrapper.js
M static/scripts/mvc/history/options-menu.js
M static/scripts/mvc/tag.js
M static/scripts/mvc/workflow/workflow-view.js
M static/scripts/mvc/workflow/workflow.js
M static/style/blue/base.css
M test-data/1.fastqsanger
M test-data/1.fastqsolexa
M test-data/simple_line_alternative.txt
M test-data/simple_lines_interleaved.txt
M test/base/driver_util.py
M test/base/integration_util.py
A test/functional/tools/config_vars.xml
M test/functional/tools/samples_tool_conf.xml
A test/integration/test_mules_as_job_handlers.py
M test/selenium_tests/test_workflow_editor.py
M test/shed_functional/base/twilltestcase.py
M test/shed_functional/functional_tests.py
M test/unit/jobs/test_job_configuration.py
M test/unit/unittest_utils/galaxy_mock.py
M tools/data_source/data_source.py
M tools/data_source/upload.py
Log Message:
-----------
Merge remote-tracking branch 'upstream/dev' into maps_for_developer_only
Commit: 9626350168b6e0551506505979815de4e8d56af8
https://github.com/galaxyproject/galaxy/commit/9626350168b6e055150650597981…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-29 (Wed, 29 Nov 2017)
Changed paths:
M Makefile
R static/GruntFile.js.map
Log Message:
-----------
Makefile targets, and somehow we had a gruntfile map in the repo from ancient times.
Commit: fde9f823d592db70b220e73e24305751c90c7ca7
https://github.com/galaxyproject/galaxy/commit/fde9f823d592db70b220e73e2430…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-29 (Wed, 29 Nov 2017)
Changed paths:
M client/README.md
Log Message:
-----------
Update client README
Commit: 1c30a850afe24950343266efa3120cfe0134a314
https://github.com/galaxyproject/galaxy/commit/1c30a850afe24950343266efa312…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-11-29 (Wed, 29 Nov 2017)
Changed paths:
M Makefile
Log Message:
-----------
Add a better client commit warning to the Makefile.
Commit: 5e17e44db533cea7be20f5f0a1455219f4de67c1
https://github.com/galaxyproject/galaxy/commit/5e17e44db533cea7be20f5f0a145…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2017-11-30 (Thu, 30 Nov 2017)
Changed paths:
M .gitignore
M Makefile
M client/README.md
M client/gulpfile.js
M client/package.json
M client/webpack.config.js
R static/GruntFile.js.map
R static/scripts/bundled/adminToolshed.bundled.js.map
Log Message:
-----------
Merge pull request #5058 from dannon/maps_for_developer_only
Build endpoint separation
Compare: https://github.com/galaxyproject/galaxy/compare/893e494c0275...5e17e44db533