aboutsummaryrefslogtreecommitdiff
path: root/js
AgeCommit message (Collapse)AuthorFilesLines
2013-01-13Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto10-19/+164
Conflicts: Makefile README.md component.json docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/assets/js/bootstrap-affix.js docs/assets/js/bootstrap-alert.js docs/assets/js/bootstrap-button.js docs/assets/js/bootstrap-carousel.js docs/assets/js/bootstrap-collapse.js docs/assets/js/bootstrap-dropdown.js docs/assets/js/bootstrap-modal.js docs/assets/js/bootstrap-popover.js docs/assets/js/bootstrap-scrollspy.js docs/assets/js/bootstrap-tab.js docs/assets/js/bootstrap-tooltip.js docs/assets/js/bootstrap-transition.js docs/assets/js/bootstrap-typeahead.js docs/assets/js/bootstrap.js docs/components.html docs/css.html docs/examples/fluid.html docs/extend.html docs/getting-started.html docs/index.html docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache docs/templates/pages/extend.mustache docs/templates/pages/getting-started.mustache docs/templates/pages/index.mustache docs/templates/pages/javascript.mustache js/bootstrap-affix.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-tooltip.js js/bootstrap-transition.js js/bootstrap-typeahead.js less/bootstrap.less less/buttons.less less/forms.less less/navbar.less less/popovers.less less/responsive-767px-max.less less/responsive.less less/tables.less less/tooltip.less less/type.less less/variables.less package.json
2013-01-10Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long agoMark Otto1-2/+2
2012-12-26Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wipMark Otto6-18/+144
2012-12-24Merge pull request #6378 from Yohn/patch-7fat-kun2-1/+13
fixes tooltip insert problems
2012-12-24made container option be falseYohn1-1/+1
2012-12-24removed the length checkYohn1-1/+1
updated it to @fat's suggestion
2012-12-23Update js/tests/unit/bootstrap-tooltip.jsYohn1-0/+10
2012-12-23adding container option to tooltipsYohn1-1/+3
2012-12-23Assign event variables at declarationsKAWACHI Takashi1-4/+4
2012-12-23Tooltips fires show, shown, hide, hidden eventsKAWACHI Takashi2-0/+88
It is re-worked from #3691.
2012-12-22Version bumpMark Otto13-13/+13
2012-12-22Merge pull request #6349 from Yohn/patch-6fat-kun2-4/+12
Fixes #5753 with tooltip('toogle')
2012-12-22add data-api namespace to dropdownfat1-1/+1
2012-12-22shifting focus to parent and adding aria menuitem for dropdownfat1-1/+4
2012-12-22read data options in constructor for collapsefat1-1/+1
2012-12-22allow multiple trigger types in tooltip and popover + default tooltip to ↵fat1-8/+16
hover & focus
2012-12-21chnage for #6248fat1-1/+1
2012-12-21add support for [data-slide-to] attr on carouselfat1-1/+8
2012-12-21add direction prop to carousel slide eventfat2-0/+13
2012-12-21Merge branch 'marcelkorpel-master' into 2.3.0-wipfat2-0/+6
2012-12-21Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into ↵fat2-0/+6
marcelkorpel-master
2012-12-20Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto2-2/+2
Conflicts: docs/assets/css/bootstrap.css docs/templates/pages/base-css.mustache less/dropdowns.less less/forms.less
2012-12-20Update js/tests/unit/bootstrap-tooltip.jsYohn1-1/+9
2012-12-20fixes tooltip('toggle')Yohn1-3/+3
2012-12-20reset carousel in the case that it is reinstantiated twicefat1-1/+1
2012-12-20if carousel element already open, don't reopen it duh bruh bruhfat1-1/+1
2012-12-20Merge branch '2.2.3' into 3.0.0-wipMark Otto5-22/+45
Conflicts: Makefile README.md component.json docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/assets/js/bootstrap-affix.js docs/assets/js/bootstrap-alert.js docs/assets/js/bootstrap-button.js docs/assets/js/bootstrap-carousel.js docs/assets/js/bootstrap-collapse.js docs/assets/js/bootstrap-dropdown.js docs/assets/js/bootstrap-modal.js docs/assets/js/bootstrap-popover.js docs/assets/js/bootstrap-scrollspy.js docs/assets/js/bootstrap-tab.js docs/assets/js/bootstrap-tooltip.js docs/assets/js/bootstrap-transition.js docs/assets/js/bootstrap-typeahead.js docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/index.html docs/templates/pages/base-css.mustache docs/templates/pages/index.mustache docs/templates/pages/javascript.mustache js/bootstrap-affix.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-tooltip.js js/bootstrap-transition.js js/bootstrap-typeahead.js less/bootstrap.less less/responsive.less less/type.less package.json
2012-12-19add js support for carousel indicatorsfat2-8/+20
2012-12-19whitespace in tooltip + don't pass empty selector to $() in dropdown.jsfat1-2/+3
2012-12-19can't extend bounding box thingyfat1-1/+1
2012-12-19fix ghetto ass timeout shitfat1-2/+14
2012-12-19remove inside support from tooltip + fix tooltip svg support + change ↵fat1-10/+8
makefile to rely on local npm install
2012-12-10Version bumpMark Otto13-13/+13
2012-12-08Merge branch 'master' into 3.0.0-wipMark Otto24-31/+262
Conflicts: docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/css.html docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache docs/templates/pages/javascript.mustache less/breadcrumbs.less less/tables.less less/tests/css-tests.html
2012-12-07get tests passing for typeahead :Pfat2-15/+26
2012-12-07insert menu of typeahead after input which it suggests on #3529fat1-2/+2
note: this will likely break things for people in the same way that doing this to tooltip did… however we think this is a better insertion model for z-index,scrolling,modal,etc. applications
2012-12-07focus on escape in typeaheadfat1-1/+2
2012-12-07Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wipfat2-2/+19
2012-12-07remove slide from carousel constructor #5579fat1-1/+0
2012-12-07Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-navbilly gates2-2/+19
Fix issue with double move event firing in typeahead.
2012-12-07rebuild and only select visible dropdown itemsfat1-1/+1
2012-12-07Merge pull request #6118 from godric7/masterbilly gates1-1/+1
scrollSpy - add parent scrollTop to offset calculation
2012-12-07add noConflict functionality to all bootstrap pluginsfat24-10/+213
2012-12-05Merge branch '2.2.2-wip' into 3.0.0-wipMark Otto2-3/+4
Conflicts: README.md docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/examples/fluid.html docs/scaffolding.html less/breadcrumbs.less less/popovers.less less/responsive.less
2012-12-04Fixes #4550: Temporary fix for dropdown taps on mobileMark Otto1-0/+1
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781 * Stops propagation for touchstart for dropdowns
2012-12-04Update js/bootstrap-scrollspy.jsGodric1-1/+1
Fix for Bootstrap issue #6013 "scrollSpy - offset calculation" https://github.com/twitter/bootstrap/issues/6013
2012-12-02Set focus back to input field after clicking an itemMarcel Korpel2-0/+6
Test 'focus is still set' added Fixes issue #5933
2012-12-02Merge branch 'Moveo-master' into 2.2.2-wipMark Otto1-3/+3
2012-11-30version bump to 3.0Mark Otto13-13/+13
2012-11-27leave it to the developer to decide how to use the content of the popoverSwaagie1-3/+3