aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-02-08Merge branch 'master' into fix-12154Mark Otto160-10641/+12885
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2014-02-08gruntMark Otto1-1/+1
2014-02-08gruntMark Otto1-1/+1
2014-02-08grunt with new mixinsMark Otto11-156/+160
2014-02-08gruntMark Otto6-7/+7
2014-02-08Merge pull request #12552 from stoudenmire/carousel-icon-classname-fixMark Otto1-2/+2
Fixes two typos in carousel.less
2014-02-08Merge branch 'master' into pr/12462Mark Otto46-460/+676
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2014-02-08Merge branch 'pr/12579'Mark Otto4-84/+64
2014-02-08gruntMark Otto1-1/+1
2014-02-09Merge pull request #12655 from twbs/holder.jsXhmikosR2-86/+234
Update holder.js to v2.3.1.
2014-02-08Merge pull request #12645 from ZDroid/docs-js-semicolonsMark Otto4-16/+16
Omit semicolons consistently in docs
2014-02-08gruntMark Otto2-1/+6
2014-02-08Merge branch 'master' into pr/12639Mark Otto21-104/+102
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2014-02-08Merge pull request #12659 from ZDroid/blockquote-font-sizeMark Otto2-1/+3
Fix #12656: add @blockquote-font-size
2014-02-08Merge pull request #12632 from ZDroid/exclude-jadeChris Rebert4-3/+5
Exclude jade files from docs
2014-02-08Move jade files to docs/jade/Zlatan Vasović4-3/+5
2014-02-08Fix #12656: add @blockquote-font-sizeZlatan Vasović2-1/+3
2014-02-08Update holder.js to v2.3.1.XhmikosR2-86/+234
Fix #12653.
2014-02-07disable BrowserStack tests due to flakinessChris Rebert1-1/+1
Running "browserstack_runner" task Using config: /home/travis/build/twbs/bootstrap/browserstack.json Launching server on port: 8888 Downloading tunnel jar to `/home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar` Launching tunnel Error: Invalid or corrupt jarfile /home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar [Runner alert] Tunnel launch timeout Exiting Non existent tunnel
2014-02-07Merge pull request #12633 from twbs/panels_and_tablesMark Otto6-84/+85
Properly reset borders on table cells in panels
2014-02-07Merge branch 'master' into panels_and_tablesMark Otto15-19/+28
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2014-02-07Nuke shit I added in 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't ↵Mark Otto6-9/+4
come until v4
2014-02-07Fix wrong idJulian Thilo1-1/+1
2014-02-07Merge pull request #12648 from ZDroid/index.html-onlyChris Rebert1-1/+1
Replace wildcard with file name
2014-02-07Replace wildcard with file nameZlatan Vasović1-1/+1
2014-02-07Omit semicolons consistently in docsZlatan Vasović4-16/+16
2014-02-07Merge pull request #12636 from ZDroid/grunt-jshintrcChris Rebert6-6/+4
Avoid setting `jshint node: true` in every Grunt JS file
2014-02-07Merge pull request #12637 from ZDroid/text-truncate-typoChris Rebert1-2/+2
Fix .text-truncate() typo
2014-02-07Drop -o-user-selectBas Bosman8-8/+6
2014-02-07Fix .text-truncate() typoZlatan Vasović1-2/+2
2014-02-07Avoid setting `jshint node: true` in every Grunt JS fileZlatan Vasović6-6/+4
2014-02-07Fixes #12486: Restore full width inputs for input groups in inline forms and ↵Mark Otto6-7/+23
navbars
2014-02-07Follow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better position ↵Mark Otto1-2/+2
the sidebar so the potential scrollbar doesn't get hidden by the navbar
2014-02-07Fixes #12447: Properly reset borders on table cells in panelsMark Otto6-84/+85
2014-02-07grunt for daysMark Otto7-6/+9
2014-02-07Merge pull request #12629 from twbs/search_inputs_iosMark Otto1-0/+14
Override iOS search input's extra round corners
2014-02-07Override iOS search input's extra round cornersMark Otto1-0/+14
2014-02-07Fixes #12477: Clarify IE support in docsMark Otto1-1/+1
2014-02-07Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-0/+1
2014-02-07Fixes #12590: Add Korean translation linkMark Otto1-0/+1
2014-02-07Merge pull request #12319 from twbs/address-12007Mark Otto1-0/+1
Clarify target of dropdown events
2014-02-07clarify commentMark Otto1-1/+1
2014-02-07consistencyMark Otto2-2/+2
2014-02-07Fixes #12526: Add scrollbars when necessary to the Dashboard example's sidebarMark Otto1-0/+2
2014-02-07Fixes #12555: Rearrange variables to place grids and containers closerMark Otto12-63/+60
2014-02-07Fixes #12614: Add progress bar example with visible labelMark Otto2-0/+18
2014-02-07Fixes #12611: Mention limitation of one plugin's data attributes per elementMark Otto1-2/+7
2014-02-07Merge pull request #12497 from twbs/container-fluid-is-now-a-thingMark Otto1-5/+0
rm DIY full-width callout now that there's .container-fluid
2014-02-06property order because @zdroid <3Mark Otto1-1/+1
2014-02-06Merge pull request #12620 from twbs/thumbnail-extendMark Otto6-8/+7
use :extend in thumbnail Less
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-06 20:34:05 +0000