aboutsummaryrefslogtreecommitdiff
path: root/js
AgeCommit message (Collapse)AuthorFilesLines
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
2012-11-13Fix issue with double move event firing in typeahead.Paul McLanahan2-2/+19
Fix test to catch issue. Fix #5806.
2012-11-05version bumpMark Otto13-13/+13
2012-10-302.2.1 - hotfix for carouselfat13-13/+13
2012-10-30fix carousel and rebuild jsfat1-1/+1
2012-10-29Merge branch '2.1.2-wip'v2.2.0Mark Otto20-133/+212
Conflicts: js/bootstrap-dropdown.js
2012-10-29v2.2.0 instead of v2.1.2Mark Otto13-15/+15
2012-10-17don't lookup typeahead when shift alt or ctrl are pushedJacob Thornton1-0/+3
2012-10-17when static, refocus on clickJacob Thornton1-3/+5
2012-10-17Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wipJacob Thornton2-4/+45
2012-10-17Merge branch 'delegate-api-to-document' of ↵Jacob Thornton8-62/+45
git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document Conflicts: js/bootstrap-carousel.js
2012-10-17Merge pull request #5309 from erlendfh/dropdown-bugfixbilly gates2-4/+45
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
2012-10-17Merge pull request #5366 from Sinetheta/2.1.2-wipbilly gates2-1/+20
Fix for #5362
2012-10-17Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wipJacob Thornton1-4/+4
2012-10-17fix carousel eventJacob Thornton1-3/+5
2012-10-17Merge pull request #5389 from frntz/2.1.2-wipbilly gates1-4/+4
Update js/bootstrap-tooltip.js
2012-10-17Merge pull request #5524 from martinstein/fix-tooltip-delegate-clickbilly gates2-2/+11
Fix tooltip not working in delegate events on click-trigger
2012-10-17Merge pull request #5531 from dmitriybudnik/carousel-js-typo-fixbilly gates2-1/+22
Fixed copy/paste caused typo
2012-10-16fixes #5336: reorder focus() call to avoid scrollingmfansler1-4/+3
2012-10-16set spesific assertions count for testDmitriy Budnik1-1/+1
2012-10-16fixed testDmitriy Budnik1-2/+3