Changeset [ee225871a2c3eb8f8d3c95b743cdd0112ca41476] by Robert Buels
Revision ee225871a2c3eb8f8d3c95b743cdd0112ca41476,
committed by Robert Buels
· May 21st, 2013 @ 02:45 PM
Merge master into uiredo
Conflicts:
faceted_track_selector.css index.html jbrowse_conf.json main.css
src/JBrowse/Browser.js src/JBrowse/GenomeView.js src/jszlib
https://github.com/GMOD/jbrowse/commit/ee225871a2c3eb8f8d3c95b743cd...
172 changed files
-
A
img/JBrowse_logo.png -
A
img/JBrowse_logo.svg -
A
src/themes/JMetro/Calendar.css -
A
src/themes/JMetro/Calendar_rtl.css -
A
src/themes/JMetro/ColorPalette.css -
A
src/themes/JMetro/Common.css -
A
src/themes/JMetro/Dialog.css -
A
src/themes/JMetro/Dialog_rtl.css -
A
src/themes/JMetro/Editor.css -
A
src/themes/JMetro/Editor_rtl.css -
A
src/themes/JMetro/Menu.css -
A
src/themes/JMetro/Menu_rtl.css -
A
src/themes/JMetro/ProgressBar.css -
A
src/themes/JMetro/TimePicker.css -
A
src/themes/JMetro/TimePicker_rtl.css -
A
src/themes/JMetro/TitlePane.css -
A
src/themes/JMetro/TitlePane_rtl.css -
A
src/themes/JMetro/Toolbar.css -
A
src/themes/JMetro/Tree.css -
A
src/themes/JMetro/Tree_rtl.css -
A
src/themes/JMetro/form/Button.css -
A
src/themes/JMetro/form/Checkbox.css -
A
src/themes/JMetro/form/Common.css -
A
src/themes/JMetro/form/RadioButton.css -
A
src/themes/JMetro/form/Select.css -
A
src/themes/JMetro/form/Slider.css -
A
src/themes/JMetro/form/Slider_rtl.css -
A
src/themes/JMetro/images/accordionItemActive.gif -
A
src/themes/JMetro/images/accordionItemHover.gif -
A
src/themes/JMetro/images/buttonActive.png -
A
src/themes/JMetro/images/buttonDisabled.png -
A
src/themes/JMetro/images/buttonEnabled.png -
A
src/themes/JMetro/images/buttonHover.png -
A
src/themes/JMetro/images/calendarDayLabel.png -
A
src/themes/JMetro/images/calendarMonthLabel.png -
A
src/themes/JMetro/images/calendarYearLabel.png -
A
src/themes/JMetro/images/checkmark.gif -
A
src/themes/JMetro/images/checkmark.png -
A
src/themes/JMetro/images/checkmarkNoBorder.gif -
A
src/themes/JMetro/images/checkmarkNoBorder.png -
A
src/themes/JMetro/images/circleIcon.gif -
A
src/themes/JMetro/images/circleIcon.png -
A
src/themes/JMetro/images/comboArrowDown.gif -
A
src/themes/JMetro/images/dijitProgressBarAnim.gif -
A
src/themes/JMetro/images/dijitProgressBarAnim.psd -
A
src/themes/JMetro/images/dndCopy.png -
A
src/themes/JMetro/images/dndMove.png -
A
src/themes/JMetro/images/dndNoCopy.png -
A
src/themes/JMetro/images/dndNoMove.png -
A
src/themes/JMetro/images/dojoTundraGradientBg.gif -
A
src/themes/JMetro/images/dojoTundraGradientBg.png -
A
src/themes/JMetro/images/doubleArrowDown.png -
A
src/themes/JMetro/images/doubleArrowUp.png -
A
src/themes/JMetro/images/folderClosed.gif -
A
src/themes/JMetro/images/folderOpened.gif -
A
src/themes/JMetro/images/i.gif -
A
src/themes/JMetro/images/i_half.gif -
A
src/themes/JMetro/images/i_half_rtl.gif -
A
src/themes/JMetro/images/i_rtl.gif -
A
src/themes/JMetro/images/leaf.gif -
A
src/themes/JMetro/images/loading.gif -
A
src/themes/JMetro/images/menu.png -
A
src/themes/JMetro/images/minusButton.gif -
A
src/themes/JMetro/images/no.gif -
A
src/themes/JMetro/images/noX.gif -
A
src/themes/JMetro/images/plusButton.gif -
A
src/themes/JMetro/images/popupMenuBg.gif -
A
src/themes/JMetro/images/preciseSliderThumb.gif -
A
src/themes/JMetro/images/preciseSliderThumb.png -
A
src/themes/JMetro/images/preciseSliderThumbFocus.gif -
A
src/themes/JMetro/images/preciseSliderThumbFocus.png -
A
src/themes/JMetro/images/progressBarAnim-1.png -
A
src/themes/JMetro/images/progressBarAnim-2.png -
A
src/themes/JMetro/images/progressBarAnim-3.png -
A
src/themes/JMetro/images/progressBarAnim-4.png -
A
src/themes/JMetro/images/progressBarAnim-5.png -
A
src/themes/JMetro/images/progressBarAnim-6.png -
A
src/themes/JMetro/images/progressBarAnim-7.png -
A
src/themes/JMetro/images/progressBarAnim-8.png -
A
src/themes/JMetro/images/progressBarAnim-9.png -
A
src/themes/JMetro/images/progressBarAnim.gif -
A
src/themes/JMetro/images/progressBarAnim.psd -
A
src/themes/JMetro/images/progressBarEmpty.png -
A
src/themes/JMetro/images/progressBarFull.png -
A
src/themes/JMetro/images/radioButtonActive.png -
A
src/themes/JMetro/images/radioButtonActiveDisabled.png -
A
src/themes/JMetro/images/radioButtonActiveHover.png -
A
src/themes/JMetro/images/radioButtonDisabled.png -
A
src/themes/JMetro/images/radioButtonEnabled.png -
A
src/themes/JMetro/images/radioButtonHover.png -
A
src/themes/JMetro/images/sliderEmpty.png -
A
src/themes/JMetro/images/sliderEmptyVertical.png -
A
src/themes/JMetro/images/sliderFull.png -
A
src/themes/JMetro/images/sliderFullFocus.png -
A
src/themes/JMetro/images/sliderFullVertical.png -
A
src/themes/JMetro/images/sliderFullVerticalFocus.png -
A
src/themes/JMetro/images/sliderThumb.png -
A
src/themes/JMetro/images/sliderThumbFocus.gif -
A
src/themes/JMetro/images/sliderThumbFocus.png -
A
src/themes/JMetro/images/smallArrowDown.png -
A
src/themes/JMetro/images/smallArrowUp.png -
A
src/themes/JMetro/images/splitContainerSizerH-thumb.png -
A
src/themes/JMetro/images/splitContainerSizerH.png -
A
src/themes/JMetro/images/splitContainerSizerV-thumb.png -
A
src/themes/JMetro/images/splitContainerSizerV.png -
A
src/themes/JMetro/images/spriteArrows.gif -
A
src/themes/JMetro/images/spriteArrows.png -
A
src/themes/JMetro/images/spriteRoundedIconsSmall.gif -
A
src/themes/JMetro/images/spriteRoundedIconsSmall.png -
A
src/themes/JMetro/images/tabActive.png -
A
src/themes/JMetro/images/tabClose.gif -
A
src/themes/JMetro/images/tabClose.png -
A
src/themes/JMetro/images/tabCloseHover.gif -
A
src/themes/JMetro/images/tabCloseHover.png -
A
src/themes/JMetro/images/tabDisabled.png -
A
src/themes/JMetro/images/tabEnabled.png -
A
src/themes/JMetro/images/tabHover.gif -
A
src/themes/JMetro/images/tabHover.png -
A
src/themes/JMetro/images/titleBar.old.png -
A
src/themes/JMetro/images/titleBarBg.gif -
A
src/themes/JMetro/images/tooltipConnectorDown.gif -
A
src/themes/JMetro/images/tooltipConnectorDown.png -
A
src/themes/JMetro/images/tooltipConnectorLeft.gif -
A
src/themes/JMetro/images/tooltipConnectorLeft.png -
A
src/themes/JMetro/images/tooltipConnectorRight.gif -
A
src/themes/JMetro/images/tooltipConnectorRight.png -
A
src/themes/JMetro/images/tooltipConnectorUp.gif -
A
src/themes/JMetro/images/tooltipConnectorUp.png -
A
src/themes/JMetro/images/treeExpand_leaf.gif -
A
src/themes/JMetro/images/treeExpand_leaf_rtl.gif -
A
src/themes/JMetro/images/treeExpand_loading.gif -
A
src/themes/JMetro/images/treeExpand_minus.gif -
A
src/themes/JMetro/images/treeExpand_minus_rtl.gif -
A
src/themes/JMetro/images/treeExpand_mius.gif -
A
src/themes/JMetro/images/treeExpand_plus.gif -
A
src/themes/JMetro/images/treeExpand_plus_rtl.gif -
A
src/themes/JMetro/images/treeHover.png -
A
src/themes/JMetro/images/validationInputBg.gif -
A
src/themes/JMetro/images/validationInputBg.png -
A
src/themes/JMetro/images/warning.png -
A
src/themes/JMetro/jmetro.css -
A
src/themes/JMetro/layout/AccordionContainer.css -
A
src/themes/JMetro/layout/BorderContainer.css -
A
src/themes/JMetro/layout/ContentPane.css -
A
src/themes/JMetro/layout/SplitContainer.css -
A
src/themes/JMetro/layout/TabContainer.css -
A
src/themes/JMetro/layout/TabContainer_rtl.css -
A
src/themes/JMetro/tundra_rtl.css -
A
src/themes/dijit.css -
A
src/themes/dijit_rtl.css -
A
src/themes/themeTester-orig.html -
A
src/themes/themeTester.html -
A
src/themes/themeTesterImages/blackButtonEnabled.gif -
A
src/themes/themeTesterImages/blackButtonHover.gif -
A
src/themes/themeTesterQuirk.html -
M
faceted_track_selector.css -
M
genome.css -
M
img/red_x.png -
M
img/slide-left.png -
M
img/slide-left.svg -
M
img/slide-right.png -
M
img/slide-right.svg -
M
img/zoom-in-1.png -
M
img/zoom-in-2.png -
M
img/zoom-out-1.png -
M
img/zoom-out-2.png -
M
index.html -
M
main.css -
M
menubar.css -
M
src/JBrowse/Browser.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/View/TrackList/Simple.js