Changeset [fe0e2e796260a8966f78ad33ff8375bf76aa467f] by Robert Buels
Revision fe0e2e796260a8966f78ad33ff8375bf76aa467f,
committed by Robert Buels
· December 12th, 2012 @ 01:04 PM
Merge branch 'jbrowse_1.7' into maint/1.8.x
https://github.com/GMOD/jbrowse/commit/fe0e2e796260a8966f78ad33ff83...
81 changed files
-
A
file_dialog.css -
A
plugins/WebApollo/js/FileLoader.js -
A
plugins/WebApollo/js/GFF3toJbrowseJson.js -
A
plugins/WebApollo/js/View/Track/DraggableAlignments.js -
A
plugins/WebApollo/tests/js_tests/index.html -
A
plugins/WebApollo/tests/js_tests/lib/jasmine-1.2.0/MIT.LICENSE -
A
plugins/WebApollo/tests/js_tests/lib/jasmine-1.2.0/jasmine-html.js -
A
plugins/WebApollo/tests/js_tests/lib/jasmine-1.2.0/jasmine.css -
A
plugins/WebApollo/tests/js_tests/lib/jasmine-1.2.0/jasmine.js -
A
plugins/WebApollo/tests/js_tests/spec/GFF3toJbrowseJsonSpec.js -
A
plugins/WebApollo/tests/js_tests/spec/JSONUtilsSpec.js -
A
src/JBrowse/Store/SeqFeature/BAM/LazyFeature.js -
A
src/JBrowse/Store/SeqFeature/GFF3.js -
A
src/JBrowse/View/ConfirmDialog.js -
A
src/JBrowse/View/FileDialog.js -
A
src/JBrowse/View/FileDialog/ResourceList.js -
A
src/JBrowse/View/FileDialog/TrackList.js -
A
src/JBrowse/View/FileDialog/TrackList/BAMDriver.js -
A
src/JBrowse/View/FileDialog/TrackList/BigWigDriver.js -
A
src/JBrowse/View/FileDialog/TrackList/GFF3Driver.js -
A
src/JBrowse/View/TrackConfigEditor.js -
A
tests/js_tests/spec/AddFiles.spec.js -
A
tests/js_tests/spec/GFF3ParserCheckDeeperFeatures.js -
A
tests/js_tests/spec/Util.spec.js -
R
src/JBrowse/Store/SeqFeature/BAM/Feature.js -
R
tests/js_tests/spec/GFF3ParserNormalSizedGFFSpec.js -
M
.gitignore -
M
docs/tutorial/conf_files/volvox.json -
M
faceted_track_selector.css -
M
genome.css -
M
icons.css -
M
img/commonIconsEnabled.png -
M
img/minus-arrowhead.png -
M
img/plus-arrowhead.png -
M
index.html -
M
jbrowse_conf.json -
M
main.css -
M
plugins/WebApollo/css/genome.css -
M
plugins/WebApollo/css/webapollo_track_styles.css -
M
plugins/WebApollo/js/FeatureEdgeMatchManager.js -
M
plugins/WebApollo/js/JSONUtils.js -
M
plugins/WebApollo/js/SequenceSearch.js -
M
plugins/WebApollo/js/Store/SeqFeature/ScratchPad.js -
M
plugins/WebApollo/js/View/Track/AnnotTrack.js -
M
plugins/WebApollo/js/View/Track/DraggableHTMLFeatures.js -
M
plugins/WebApollo/js/View/Track/SequenceTrack.js -
M
plugins/WebApollo/js/main.js -
M
release-notes.txt -
M
src/JBrowse/Browser.js -
M
src/JBrowse/ConfigAdaptor/JB_json_v1.js -
M
src/JBrowse/ConfigManager.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/Model/ArrayRepr.js -
M
src/JBrowse/Model/FileBlob.js -
M
src/JBrowse/Store/LRUCache.js -
M
src/JBrowse/Store/NCList.js -
M
src/JBrowse/Store/RemoteBinaryFile.js -
M
src/JBrowse/Store/SeqFeature/BAM.js -
M
src/JBrowse/Store/SeqFeature/BAM/File.js -
M
src/JBrowse/Store/SeqFeature/BigWig.js -
M
src/JBrowse/Store/SeqFeature/GFF3/GFF3Parser.js -
M
src/JBrowse/Store/SeqFeature/NCList.js -
M
src/JBrowse/Store/Sequence/StaticChunked.js -
M
src/JBrowse/Store/TrackMetaData.js -
M
src/JBrowse/Util.js -
M
src/JBrowse/View/Ruler.js -
M
src/JBrowse/View/Track/Alignments.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/Track/Canvas.js -
M
src/JBrowse/View/Track/FeatureCoverage.js -
M
src/JBrowse/View/Track/FixedImage.js -
M
src/JBrowse/View/Track/GridLines.js -
M
src/JBrowse/View/Track/HTMLFeatures.js -
M
src/JBrowse/View/Track/LocationScale.js -
M
src/JBrowse/View/Track/Sequence.js -
M
src/JBrowse/View/Track/WiggleBase.js -
M
src/JBrowse/View/TrackList/Faceted.js -
M
src/JBrowse/View/TrackList/Simple.js -
M
tests/js_tests/index.html -
M
tests/js_tests/spec/GFF3ParserSpec.js -
M
track_styles.css