Changeset [c95f9b1d24b3c189e574fb6bcada09b95e12c1eb] by Erik Derohanian
Revision c95f9b1d24b3c189e574fb6bcada09b95e12c1eb,
committed by Erik Derohanian
· December 11th, 2013 @ 01:37 PM
Merge branch 'master' into namerest
https://github.com/GMOD/jbrowse/commit/c95f9b1d24b3c189e574fb6bcada...
58 changed files
-
A
docs/tutorial/data_files/volvox-sorted.bam.coverage.bw -
A
hierarchical_track_selector.css -
A
src/JBrowse/View/StandaloneDatasetList.js -
A
src/JBrowse/View/TrackList/Hierarchical.js -
A
src/JBrowse/View/TrackList/_TextFilterMixin.js -
M
README.md -
M
bin/bam-to-json.pl -
M
bin/flatfile-to-json.pl -
M
compat_121.html -
M
docs/tutorial/conf_files/volvox.json -
M
docs/tutorial/data_files/volvox-sorted.bam.conf -
M
docs/tutorial/data_files/volvox-sorted.bam.coverage.conf -
M
docs/tutorial/data_files/volvox.vcf.conf -
M
docs/tutorial/data_files/volvox_microarray.bw.conf -
M
docs/tutorial/data_files/volvox_sine.bw.conf -
M
genome.css -
M
index.html -
M
jbrowse_conf.json -
M
main.css -
M
release-notes.txt -
M
setup.sh -
M
src/JBrowse/Browser.js -
M
src/JBrowse/ConfigAdaptor/JB_json_v1.js -
M
src/JBrowse/ConfigManager.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/JBrowse.profile.js -
M
src/JBrowse/Model/FileBlob.js -
M
src/JBrowse/Store/SeqFeature/NCList_v0.js -
M
src/JBrowse/Store/TrackMetaData.js -
M
src/JBrowse/Util.js -
M
src/JBrowse/Util/TextIterator.js -
M
src/JBrowse/View/DetailsMixin.js -
M
src/JBrowse/View/FileDialog/TrackList.js -
M
src/JBrowse/View/Track/Alignments2.js -
M
src/JBrowse/View/Track/CanvasFeatures.js -
M
src/JBrowse/View/Track/HTMLFeatures.js -
M
src/JBrowse/View/Track/_YScaleMixin.js -
M
src/JBrowse/View/TrackList/Simple.js -
M
src/JBrowse/main.js -
M
src/perl5/Bio/JBrowse/Cmd/FlatFileToJson.pm -
M
src/perl5/Bio/JBrowse/Cmd/FormatSequences.pm -
M
src/perl5/Bio/JBrowse/Cmd/IndexNames.pm -
M
src/perl5/Bio/JBrowse/Cmd/IndexNames/BackCompat.pm -
M
src/perl5/Bio/JBrowse/Cmd/NCFormatter.pm -
M
src/perl5/Bio/JBrowse/HashStore.pm -
M
src/perl5/JsonFileStorage.pm -
M
tests/data/volvox_formatted_1_2_1/trackInfo.js -
M
tests/data/volvox_formatted_refseqs/trackList.json -
M
tests/js_tests/spec/ConfigManager.spec.js -
M
tests/js_tests/spec/TabixIndex.spec.js -
M
tests/js_tests/spec/TabixIndexedFile.spec.js -
M
tests/perl_tests/biodb-to-json.pl.t -
M
tests/perl_tests/flatfile-to-json.pl.t -
M
tests/perl_tests/wig-to-json.pl.t -
M
tests/selenium_tests/jbrowse_selenium/JBrowseTest.py -
M
tests/selenium_tests/jbrowse_selenium/track_selectors.py -
M
tests/selenium_tests/volvox_biodb_test.py -
M
tests/selenium_tests/yeast_biodb_test.py