Changeset [22143ab05b76b06112f5161a56f4878e74455a29] by Robert Buels
Revision 22143ab05b76b06112f5161a56f4878e74455a29,
committed by Robert Buels
· October 9th, 2013 @ 11:47 AM
Merge branch 'master' into 2.x
Conflicts:
compat_121.html index.html src/JBrowse/Browser.js
src/JBrowse/Store/SeqFeature/NCList.js
src/JBrowse/Store/SeqFeature/SequenceChunks.js
src/JBrowse/Store/SeqFeature/VCFTabix.js
src/JBrowse/View/FeatureGlyph/Alignment.js
src/JBrowse/View/FeatureGlyph/ProcessedTranscript.js
src/JBrowse/View/FeatureGlyph/Segments.js
src/JBrowse/View/RegionBrowser.js
src/JBrowse/View/Track/Alignments2.js
src/JBrowse/View/Track/HTMLFeatures.js
src/JBrowse/View/Track/Sequence.js
src/JBrowse/View/Track/Wiggle/Density.js
src/JBrowse/View/Track/_AlignmentsMixin.js themes/base/browser.css
track_styles.css
https://github.com/GMOD/jbrowse/commit/22143ab05b76b06112f5161a56f4...
69 changed files
-
A
build/format_release_notes.pl -
A
plugins/RegexSequenceSearch/js/RegexSequenceSearch.profile.js -
A
src/JBrowse/Util/TextIterator.js -
A
src/JBrowse/View/Track/CanvasVariants.js -
A
src/JBrowse/View/Track/_ExportMixin.js -
A
src/JBrowse/View/Track/_FeatureDetailMixin.js -
A
src/JBrowse/View/Track/_NamedFeatureFiltersMixin.js -
A
src/JBrowse/View/Track/_VariantDetailMixin.js -
A
src/JBrowse/View/Track/_YScaleMixin.js -
A
src/JBrowse/init.js -
R
build/init.js -
R
src/JBrowse/View/Track/Alignments.js -
R
src/JBrowse/View/Track/ExportMixin.js -
R
src/JBrowse/View/Track/FeatureDetailMixin.js -
R
src/JBrowse/View/Track/VariantDetailMixin.js -
R
src/JBrowse/View/Track/YScaleMixin.js -
R
src/perl5/Bio/JBrowse/PartialSorter.pm -
R
src/perl5/FastaDatabase.pm -
R
tests/perl_tests/FastaDatabase.t -
R
tests/perl_tests/partialsorter.t -
M
Makefile.PL -
M
README.md -
M
bin/flatfile-to-json.pl -
M
bin/generate-names.pl -
M
bin/prepare-refseqs.pl -
M
build/Makefile -
M
docs/tutorial/data_files/volvox.test.vcf.gz -
M
docs/tutorial/data_files/volvox.test.vcf.gz.tbi -
M
docs/tutorial/data_files/volvox.vcf.conf -
M
index.html -
M
release-notes.txt -
M
src/JBrowse/Browser.js -
M
src/JBrowse/FeatureFiltererMixin.js -
M
src/JBrowse/Model/FileBlob.js -
M
src/JBrowse/Store/SeqFeature/NCList.js -
M
src/JBrowse/Store/SeqFeature/REST.js -
M
src/JBrowse/Store/SeqFeature/VCFTabix.js -
M
src/JBrowse/Store/SeqFeature/VCFTabix/LazyFeature.js -
M
src/JBrowse/Store/SeqFeature/VCFTabix/Parser.js -
M
src/JBrowse/Store/SeqFeature/_MismatchesMixin.js -
M
src/JBrowse/Store/TabixIndexedFile.js -
M
src/JBrowse/View/FeatureGlyph/Alignment.js -
M
src/JBrowse/View/FeatureGlyph/ProcessedTranscript.js -
M
src/JBrowse/View/FeatureGlyph/Segments.js -
M
src/JBrowse/View/RegionBrowser.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/Combination.js -
M
src/JBrowse/View/Track/FixedImage/Wiggle.js -
M
src/JBrowse/View/Track/HTMLFeatures.js -
M
src/JBrowse/View/Track/HTMLVariants.js -
M
src/JBrowse/View/Track/SNPCoverage.js -
M
src/JBrowse/View/Track/Sequence.js -
M
src/JBrowse/View/Track/Wiggle/Density.js -
M
src/JBrowse/View/Track/Wiggle/XYPlot.js -
M
src/JBrowse/View/Track/Wiggle/_Scale.js -
M
src/JBrowse/View/Track/WiggleBase.js -
M
src/JBrowse/View/Track/_AlignmentsMixin.js -
M
src/perl5/Bio/JBrowse/Cmd/FlatFileToJson.pm -
M
src/perl5/Bio/JBrowse/Cmd/FormatSequences.pm -
M
src/perl5/Bio/JBrowse/FeatureStream/GFF3_LowLevel.pm -
M
src/perl5/Bio/JBrowse/HashStore.pm -
M
tests/perl_tests/add-json.pl.t -
M
tests/perl_tests/featurestream.t -
M
tests/perl_tests/maker2jbrowse.t -
M
themes/base/browser.css -
M
themes/base/regionbrowser.css -
M
themes/base/sequence.css