Changeset [f2c666d7d3dc06669e94da834c89e34285aa5ce1] by Robert Buels
Revision f2c666d7d3dc06669e94da834c89e34285aa5ce1,
committed by Robert Buels
· December 18th, 2013 @ 11:10 AM
Merge branch 'master' into namerest
https://github.com/GMOD/jbrowse/commit/f2c666d7d3dc06669e94da834c89...
60 changed files
-
A
bin/json2conf.pl -
A
docs/tutorial/data_files/functions.conf -
A
jbrowse.conf -
A
tests/js_tests/spec/VCF.spec.js -
A
tests/selenium_tests/jasmine_test.py -
M
bin/flatfile-to-json.pl -
M
bin/wig-to-json.pl -
M
build/Makefile -
M
docs/docs.css -
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.gff3.conf -
M
docs/tutorial/data_files/volvox.vcf.conf -
M
docs/tutorial/data_files/volvox_fromconfig.conf -
M
docs/tutorial/data_files/volvox_microarray.bw.conf -
M
docs/tutorial/data_files/volvox_sine.bw.conf -
M
docs/tutorial/index.html -
M
index.html -
M
jbrowse_conf.json -
M
main.css -
M
plugins/RegexSequenceSearch/js/main.js -
M
release-notes.txt -
M
setup.sh -
M
src/JBrowse/Browser.js -
M
src/JBrowse/ConfigAdaptor/JB_json_v1.js -
M
src/JBrowse/ConfigAdaptor/conf.js -
M
src/JBrowse/ConfigManager.js -
M
src/JBrowse/Model/DataView.js -
M
src/JBrowse/Model/TabixIndex.js -
M
src/JBrowse/Store/Hash.js -
M
src/JBrowse/Store/SeqFeature/FromConfig.js -
M
src/JBrowse/Store/SeqFeature/GFF3.js -
M
src/JBrowse/Store/SeqFeature/NCList.js -
M
src/JBrowse/Store/SeqFeature/VCFTabix.js -
M
src/JBrowse/Store/TabixIndexedFile.js -
M
src/JBrowse/Util.js -
M
src/JBrowse/View/DetailsMixin.js -
M
src/JBrowse/View/FASTA.js -
M
src/JBrowse/View/InfoDialog.js -
M
src/JBrowse/View/Track/CanvasFeatures.js -
M
src/JBrowse/View/Track/_FeatureDetailMixin.js -
M
src/JBrowse/View/Track/_VariantDetailMixin.js -
M
src/JBrowse/View/TrackList/Hierarchical.js -
M
src/JBrowse/main.js -
M
src/perl5/Bio/JBrowse/Cmd/BioDBToJson.pm -
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/NCFormatter.pm -
M
src/perl5/Bio/JBrowse/FeatureStream.pm -
M
src/perl5/GenomeDB.pm -
M
src/perl5/JsonFileStorage.pm -
M
tests/js_tests/index.html -
M
tests/js_tests/spec/GBrowseParseTestBasic.conf -
M
tests/js_tests/spec/GBrowseParser.spec.js -
M
tests/js_tests/spec/GFF3.spec.js -
M
tests/selenium_tests/embedded_mode_test.py -
M
tests/selenium_tests/jbrowse_selenium/JBrowseTest.py -
M
tests/selenium_tests/volvox_biodb_test.py