Changeset [fad5407525ec035d8a10c465f37ce8ce7e2f2458] by Robert Buels
Revision fad5407525ec035d8a10c465f37ce8ce7e2f2458,
committed by Robert Buels
· November 9th, 2012 @ 02:57 PM
Merge branch 'master' into store_API_and_issue125
Conflicts:
src/JBrowse/Store/SeqFeature/BAM.js
src/JBrowse/Store/SeqFeature/BAM/Feature.js
src/JBrowse/Store/SeqFeature/BAM/File.js
src/JBrowse/View/Track/BlockBased.js
src/JBrowse/View/Track/HTMLFeatures.js
src/JBrowse/View/Track/Sequence.js
src/JBrowse/View/Track/Wiggle.js
https://github.com/GMOD/jbrowse/commit/fad5407525ec035d8a10c465f37c...
42 changed files
-
A
docs/tutorial/data_files/volvox_sine.bw -
A
docs/tutorial/data_files/volvox_sine.bw.conf -
A
docs/tutorial/data_files/volvox_sine.wig -
A
src/JBrowse/View/Track/Wiggle/Density.js -
A
src/JBrowse/View/Track/Wiggle/XYPlot.js -
A
src/JBrowse/View/Track/WiggleBase.js -
A
tests/data/empty.bam -
A
tests/data/empty.bam.bai -
A
tests/data/final.merged.sorted.rgid.mkdup.realign.recal.bam -
A
tests/data/final.merged.sorted.rgid.mkdup.realign.recal.bam.bai -
A
tests/data/test_deletion_2_0.snps.bwa_align.sorted.grouped.bam -
A
tests/data/test_deletion_2_0.snps.bwa_align.sorted.grouped.bam.bai -
M
bin/add-track-json.pl -
M
build/Makefile -
M
docs/tutorial/data_files/volvox_microarray.bw.conf -
M
main.css -
M
release-notes.txt -
M
setup.sh -
M
src/JBrowse/ConfigAdaptor/JB_json_v1.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/JBrowse.profile.js -
M
src/JBrowse/Model/XHRBlob.js -
M
src/JBrowse/Store/BigWig.js -
M
src/JBrowse/Store/LRUCache.js -
M
src/JBrowse/Store/RemoteBinaryFile.js -
M
src/JBrowse/Store/SeqFeature/BAM.js -
M
src/JBrowse/Store/SeqFeature/BAM/Feature.js -
M
src/JBrowse/Store/SeqFeature/BAM/File.js -
M
src/JBrowse/Store/SeqFeature/BAM/Util.js -
M
src/JBrowse/Util.js -
M
src/JBrowse/View/Track/Alignments.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/Track/ExportMixin.js -
M
src/JBrowse/View/Track/HTMLFeatures.js -
M
src/JBrowse/View/Track/Sequence.js -
M
src/JBrowse/View/Track/Wiggle.js -
M
src/JBrowse/main.js -
M
tests/js_tests/spec/BAM.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 -
M
track_styles.css