Changeset [8c4ba19201f82e44371c27a57030ad6371eacfcb] by Robert Buels
Revision 8c4ba19201f82e44371c27a57030ad6371eacfcb,
committed by Robert Buels
· December 3rd, 2012 @ 01:45 AM
Merge branch 'add_files' into jbrowse_1.7
Conflicts:
tests/js_tests/index.html
https://github.com/GMOD/jbrowse/commit/8c4ba19201f82e44371c27a57030...
23 changed files
-
A
file_dialog.css -
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/TrackConfigEditor.js -
A
tests/js_tests/spec/AddFiles.spec.js -
A
tests/js_tests/spec/Util.spec.js -
M
genome.css -
M
icons.css -
M
img/commonIconsEnabled.png -
M
src/JBrowse/Browser.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/Model/FileBlob.js -
M
src/JBrowse/Store/SeqFeature/BAM.js -
M
src/JBrowse/Store/TrackMetaData.js -
M
src/JBrowse/Util.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/TrackList/Faceted.js -
M
src/JBrowse/View/TrackList/Simple.js -
M
tests/js_tests/index.html