Changeset [d118a650e34e64bb24bdfa601bc35ef958c63165] by Nathan Dunn
Revision d118a650e34e64bb24bdfa601bc35ef958c63165,
committed by Nathan Dunn
· March 29th, 2016 @ 11:54 AM
Merge branch 'master' of https://github.com/GMOD/jbrowse
into projection_v2_server
https://github.com/GMOD/jbrowse/commit/d118a650e34e64bb24bdfa601bc3...
33 changed files
-
A
css/protein.css -
A
docs/tutorial/data_files/volvox.sort.gff3.gz.1 -
A
docs/tutorial/data_files/volvox.sort.gff3.gz.conf -
A
docs/tutorial/data_files/volvox.sort.gff3.gz.tbi -
A
src/JBrowse/Store/SeqFeature/GFF3Tabix.js -
A
src/JBrowse/Store/SeqFeature/GFF3Tabix/LazyFeature.js -
A
src/JBrowse/View/FileDialog/TrackList/GFF3TabixDriver.js -
A
tests/js_tests/spec/GFF3Tabix.spec.js -
A
tests/travis.conf -
M
".travis.yml" -
M
compat_121.html -
M
css/genome.css -
M
plugins/NeatCanvasFeatures/js/main.js -
M
plugins/RegexSequenceSearch/js/Store/SeqFeature/RegexSearch.js -
M
release-notes.txt -
M
setup.sh -
M
src/JBrowse/Browser.js -
M
src/JBrowse/Store/SeqFeature/GFF3/Parser.js -
M
src/JBrowse/Store/SeqFeature/GlobalStatsEstimationMixin.js -
M
src/JBrowse/View/FeatureGlyph/_FeatureLabelMixin.js -
M
src/JBrowse/View/FileDialog.js -
M
src/JBrowse/View/FileDialog/ResourceList.js -
M
src/JBrowse/View/Track/Sequence.js -
M
src/dijit -
M
src/dojo -
M
src/dojox -
M
src/perl5/Bio/JBrowse/Cmd/FormatSequences.pm -
M
src/util -
M
tests/data/volvox_formatted_refseqs/trackList.json -
M
tests/js_tests/index.html -
M
tests/js_tests/spec/TabixIndexedFile.spec.js -
M
tests/perl_tests/biodb-to-json.pl.t -
M
tests/perl_tests/wig-to-json.pl.t