aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-12-18Fixes #11918: Fork the @h5bp contributing guidelines and combine with our ↵Mark Otto1-30/+137
coding guidelines
2013-12-18FixesMark Otto1-30/+137
2013-12-18fixes #11447: add docs warning about loading once for remote modal optionMark Otto1-1/+1
2013-12-18using templating doesn't seem to work there; hardcode license URL insteadChris Rebert2-2/+6
Tested the customizer, the generated zip had: css/bootstrap.css:line 6: * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>) Revised customizer generates: css/bootstrap.css:line 4: * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
2013-12-18Merge branch 'master' into docs_derpMark Otto34-631/+186
Conflicts: _layouts/default.html
2013-12-18rebuild minified customizer JS so it reflects the licensing changeChris Rebert1-1/+1
2013-12-18license in customizerMark Otto1-1/+1
2013-12-18update licensing header in JS files & run gruntChris Rebert14-289/+25
2013-12-18Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-1/+1
2013-12-18update license faqs for apacheMark Otto1-33/+28
2013-12-18cleanup licensing section moreChris Rebert1-1/+1
2013-12-18grunt after that carousel mergeMark Otto3-3/+3
2013-12-18Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-1/+1
2013-12-18another apache mentionMark Otto1-1/+1
2013-12-18remove license readme mentionMark Otto1-1/+0
2013-12-18more license mentionsMark Otto11-13/+13
2013-12-18Merge pull request #11416 from danielboendergaard/carousel-durationMark Otto1-1/+1
Carousel: Use the transition duration from CSS
2013-12-18version bumpMark Otto25-43/+43
2013-12-18Punt Apache license information and stick with MITMark Otto4-201/+23
2013-12-18gruntMark Otto1-2/+2
2013-12-18Merge pull request #11928 from twbs/we_have_to_go_back_kateMark Otto6-71/+74
Follow up to reverted commits
2013-12-18drop the the, it's cleanerMark Otto1-2/+2
2013-12-18derpMark Otto1-1/+1
2013-12-18buttons should be more mixin friendlyMark Otto2-23/+23
2013-12-18navbars need to use prefixed nav class or they won't work as expectedMark Otto4-15/+15
2013-12-18restore inline block on breadcrumbs and ensure proper code formatting for ↵Mark Otto4-4/+7
readibility
2013-12-18run grunt distMark Otto4-47/+47
2013-12-18rewrite readme to restore lost information, only with a bit more formatting ↵Mark Otto1-14/+14
consistency
2013-12-18Merge pull request #11927 from twbs/revert_commitsMark Otto4-28/+28
Revert commits
2013-12-18Revert commitsJulian Thilo4-28/+28
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team. This undoes the changes introduced by the following commits: https://github.com/twbs/bootstrap/commit/7ea34ae0ef79c793e9a9d393b4eef825b71e84b5 , https://github.com/twbs/bootstrap/commit/7376eef378fe7d5e69b8b8cce93c7c64b751d55a , https://github.com/twbs/bootstrap/commit/303ba1326bbe367598ab4cc063b4607507208e56 , https://github.com/twbs/bootstrap/commit/7d1c8c2a0ce16331583a965821690f7715e62908 , https://github.com/twbs/bootstrap/commit/11319f6da9f9a19ec40743cdfe868ac732698149 , https://github.com/twbs/bootstrap/commit/110fc8860117d8675345806219ba313b18086db2 , https://github.com/twbs/bootstrap/commit/ced08f69359f3a70771804a98fa3c499f388cc74
2013-12-18callout colorsMark Otto1-7/+11
2013-12-18more docsMark Otto5-48/+71
2013-12-18footer alignmentMark Otto1-17/+2
2013-12-18Merge branch 'master' into docs_derpMark Otto20-102/+122
2013-12-18Merge pull request #11881 from ZDroid/patch-1Mark Otto14-98/+99
Require comma on left side
2013-12-18Merge pull request #11804 from twbs/css-source-mapsMark Otto5-3/+22
enable CSS source maps in grunt-contrib-less
2013-12-18fix typoChris Rebert1-1/+1
2013-12-18Merge branch 'master' into docs_derpMark Otto12-120/+168
2013-12-18add source mapsMark Otto2-2/+2
2013-12-18Merge branch 'master' into css-source-mapsMark Otto52-978/+2146
Conflicts: Gruntfile.js
2013-12-18Fixes #11899: Ensure proper margins and .small/small usage for heading tags ↵Mark Otto3-11/+29
(e.g., .h1-.h6)
2013-12-18add inline note about navbar sizingMark Otto1-1/+1
2013-12-18Merge branch 'master' of github.com:twbs/bootstrapMark Otto9-109/+138
2013-12-18fixes #11925: cover template for firefoxMark Otto1-0/+1
2013-12-18tweaksMark Otto1-6/+7
2013-12-18Merge pull request #11923 from wangsai/fix-idChris Rebert1-1/+1
fix href of "Browser and device support"
2013-12-18fix href of "Browser and device support"wangsai1-1/+1
2013-12-17Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btnMark Otto3-11/+27
Fix handling of .btn-group placed inside .input-group-btn
2013-12-17Merge pull request #11916 from ZDroid/fix-iversionsChris Rebert1-2/+2
Downgrade Safari and OS X
2013-12-17Downgrade Safari and OS XZlatan Vasović1-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-07 23:14:12 +0000