Changeset [5090a1fd76837a0bdad00ff7c7eafc69b2a3f760] by Ed Lee
Revision 5090a1fd76837a0bdad00ff7c7eafc69b2a3f760,
committed by Ed Lee
· December 10th, 2012 @ 11:39 AM
Merge branch 'jbrowse_1.7' of github.com:berkeleybop/jbrowse
into jbrowse_1.7
https://github.com/GMOD/jbrowse/commit/5090a1fd76837a0bdad00ff7c7ea...
39 changed files
-
A
tests/js_tests/spec/GFF3ParserCheckDeeperFeatures.js -
M
.gitignore -
M
faceted_track_selector.css -
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/GFF3toJbrowseJson.js -
M
plugins/WebApollo/js/JSONUtils.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/Store/NCList.js -
M
src/JBrowse/Store/RemoteBinaryFile.js -
M
src/JBrowse/Store/SeqFeature/BigWig.js -
M
src/JBrowse/Store/SeqFeature/GFF3.js -
M
src/JBrowse/Store/SeqFeature/GFF3/GFF3Parser.js -
M
src/JBrowse/Store/SeqFeature/NCList.js -
M
src/JBrowse/View/FileDialog.js -
M
src/JBrowse/View/FileDialog/TrackList.js -
M
src/JBrowse/View/Ruler.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/Track/Canvas.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
tests/js_tests/index.html -
M
track_styles.css