Changeset [ea58e13cb0cbe28066e503ddb2176bea02febcb9] by Robert Buels
Revision ea58e13cb0cbe28066e503ddb2176bea02febcb9,
committed by Robert Buels
· July 12th, 2013 @ 09:01 AM
Merge branch 'master' into combination_track
Conflicts:
genome.css src/JBrowse/View/Track/ExportMixin.js
https://github.com/GMOD/jbrowse/commit/ea58e13cb0cbe28066e503ddb217...
37 changed files
-
A
docs/tutorial/data_files/volvox_fromconfig.conf -
A
export_dialog.css -
A
src/FileSaver -
A
src/JBrowse/Store/SeqFeature/FromConfig.js -
M
.gitmodules -
M
docs/tutorial/index.html -
M
faceted_track_selector.css -
M
genome.css -
M
icons.css -
M
img/commonIconsDisabled.png -
M
img/commonIconsEnabled.png -
M
index.html -
M
main.css -
M
release-notes.txt -
M
setup.sh -
M
src/JBrowse/BehaviorManager.js -
M
src/JBrowse/Browser.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/Store/SeqFeature/GFF3.js -
M
src/JBrowse/Store/SeqFeature/NCList.js -
M
src/JBrowse/Store/SeqFeature/REST.js -
M
src/JBrowse/Util/GFF3.js -
M
src/JBrowse/View/Dialog/SetHighlight.js -
M
src/JBrowse/View/Ruler.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/Track/ExportMixin.js -
M
src/JBrowse/View/Track/FeatureDetailMixin.js -
M
src/JBrowse/View/Track/HTMLFeatures.js -
M
src/JBrowse/View/Track/Sequence.js -
M
src/JBrowse/View/Track/WiggleBase.js -
M
src/JBrowse/View/Track/YScaleMixin.js -
M
src/JBrowse/has.js -
M
tests/js_tests/index.html -
M
tests/js_tests/spec/GFF3.spec.js -
M
tests/js_tests/spec/RESTStore.spec.js -
M
tests/selenium_tests/jbrowse_selenium/JBrowseTest.py -
M
tests/selenium_tests/jbrowse_selenium/track_selectors.py