Changeset [af1c87504a49301ef305c9be38b7da7cbf652586] by Robert Buels
Revision af1c87504a49301ef305c9be38b7da7cbf652586,
committed by Robert Buels
· July 1st, 2013 @ 05:29 AM
Merge branch 'master' into multiview
Conflicts:
css/base/faceted_track_selector.css css/base/track_styles.css
src/JBrowse/Browser.js src/JBrowse/GenomeView.js
https://github.com/GMOD/jbrowse/commit/af1c87504a49301ef305c9be38b7...
56 changed files
-
A
bin/add_bam_track.pl -
A
bin/add_bw_track.pl -
A
img/dark_20x3.png -
A
src/JBrowse/FeatureFiltererMixin.js -
A
src/JBrowse/Store/SeqFeature/GFF3/Parser.js -
A
src/JBrowse/Store/SeqFeature/SPARQL.js -
A
src/JBrowse/Util/FeatureFilters.js -
A
src/JBrowse/Util/GFF3.js -
A
tests/data/gff3_with_syncs.gff3 -
A
tests/data/gff3_with_syncs.result.json -
A
tests/js_tests/spec/GFF3.spec.js -
A
tests/js_tests/spec/SPARQLStore.spec.js -
M
.gitignore -
M
.gitmodules -
M
Makefile.PL -
M
bin/generate-names.pl -
M
css/base/browser.css -
M
css/base/faceted_track_selector.css -
M
css/base/track_styles.css -
M
docs/tutorial/data_files/volvox.gff3 -
M
release-notes.txt -
M
setup.sh -
M
src/JBrowse/Browser.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/Model/FileBlob.js -
M
src/JBrowse/Store/SeqFeature/BAM.js -
M
src/JBrowse/Store/SeqFeature/BAM/File.js -
M
src/JBrowse/Store/SeqFeature/BigWig/RequestWorker.js -
M
src/JBrowse/Store/SeqFeature/GFF3.js -
M
src/JBrowse/Store/SeqFeature/GlobalStatsEstimationMixin.js -
M
src/JBrowse/Store/SeqFeature/NCList.js -
M
src/JBrowse/Store/SeqFeature/NCList_v0.js -
M
src/JBrowse/Store/SeqFeature/VCFTabix.js -
M
src/JBrowse/Store/TabixIndexedFile.js -
M
src/JBrowse/Store/TrackMetaData.js -
M
src/JBrowse/Util.js -
M
src/JBrowse/View/Dialog/QuickHelp.js -
M
src/JBrowse/View/Track/Alignments2.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/Track/CanvasFeatures.js -
M
src/JBrowse/View/Track/ExportMixin.js -
M
src/JBrowse/View/Track/HTMLFeatures.js -
M
src/JBrowse/View/Track/Wiggle/Density.js -
M
src/JBrowse/View/Track/Wiggle/XYPlot.js -
M
src/JBrowse/View/Track/WiggleBase.js -
M
src/JBrowse/View/TrackList/Faceted.js -
M
src/JBrowse/View/TrackList/Simple.js -
M
src/dijit -
M
src/dojo -
M
src/dojox -
M
src/perl5/Bio/JBrowse/Cmd/FormatSequences.pm -
M
src/perl5/Bio/JBrowse/HashStore.pm -
M
src/util -
M
tests/js_tests/index.html -
M
tests/js_tests/spec/BAM.spec.js -
M
tests/perl_tests/generate-names.pl.t