aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-01-16Revert "Add tooltip `viewport` option, respect bounds of the viewport"Chris Rebert4-203/+30
This reverts commit edb221a20ceabebd427e27d0432e94a227717217. Reverting due to broken JS unit tests. Conflicts: docs/javascript.html
2014-01-16Merge pull request #12267 from twbs/ie-10Chris Rebert1-6/+5
enable IE10 for Sauce tests
2014-01-16Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap ↵Mark Otto4-30/+203
into benogle-bo-tooltip-viewport Conflicts: docs/javascript.html
2014-01-16Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-14/+11
2014-01-16Split box-sizing reset for faster renderingMark Otto6-6/+12
2014-01-16enable IE10 for Sauce testsChris Rebert1-6/+5
2014-01-16temporarily disable OS X Chrome Sauce test since it's being flakyChris Rebert1-4/+5
e.g.: Tested http://127.0.0.1:3000/js/tests/index.html Environment: OS X 10.9::chrome >> Timeout, waited for more than 300000 milliseconds
2014-01-16Merge pull request #12265 from twbs/ie-11Chris Rebert1-5/+5
enable IE11 in Sauce tests
2014-01-16Merge pull request #12264 from twbs/mavericks-safari-7Chris Rebert1-5/+1
upgrade to Safari 7 in Sauce tests
2014-01-16enable IE11 in Sauce testsChris Rebert1-5/+5
2014-01-16Merge pull request #12262 from twbs/osx-firefoxChris Rebert1-4/+4
re-enable OS X Firefox in Sauce tests
2014-01-16gruntMark Otto4-14/+14
2014-01-16upgrade to Safari 7 in Sauce testsChris Rebert1-5/+1
2014-01-16re-enable OS X Firefox in Sauce testsChris Rebert1-4/+4
2014-01-16add missing parenfat1-1/+1
2014-01-16tooltip subpixel test fixesfat1-2/+6
2014-01-16remove flaky pos bottom test which is effect by unit scroll posfat8-18/+9
2014-01-16new qunitfat9-1055/+1720
2014-01-16Merge pull request #12260 from patricker/patch-1Chris Rebert1-1/+1
Update javascript.html to fix Tabs example
2014-01-16Update javascript.htmlpatricker1-1/+1
Fixed issue in Tabs example where the div had been marked as 'active' but the li had not been. The correct tab of data would be displayed on load, but no tabs would be highlighted. The tabs with fade example does not have this issue. jsFiddle: http://jsfiddle.net/uXV56/
2014-01-16Merge pull request #12258 from ibash/masterChris Rebert1-1/+1
Fixing js error in IE9 where no transition is supported
2014-01-16Fixing js error in IE9 where no transition is supportedIslam Sharabash1-1/+1
2014-01-15Merge pull request #12252 from browserstack/browserstack-runnerChris Rebert2-1/+2
Browserstack runner tunnel timeout
2014-01-16add debug for browserstack-runnerRahul Nawani1-0/+1
2014-01-16update browserstack-runner packageRahul Nawani1-1/+1
2014-01-15Merge pull request #12245 from twbs/footer-linksMark Otto1-0/+4
add Issues & Releases links back to footer
2014-01-15add & use @modal-md Less var for uniformityChris Rebert2-1/+2
2014-01-15refactoring: add & use .bg-variant() mixinChris Rebert2-20/+14
2014-01-15refactoring: add & use .text-emphasis-variant() mixinChris Rebert2-20/+14
2014-01-15add Issues & Releases links back to footerChris Rebert1-0/+4
2014-01-15reassert #12231 & #12232 (merge went badly?)Chris Rebert1-3/+3
2014-01-15Merge branch 'master' of github.com:twbs/bootstrapMark Otto2-2/+2
Conflicts: docs/assets/css/pack.min.css
2014-01-15fix ad placementMark Otto2-2/+4
2014-01-16Fix customizer's toggle buttons' marginJulian Thilo4-4/+4
2014-01-16Adapt about.html lead to latest changesJulian Thilo1-1/+1
2014-01-16Fix footer linksJulian Thilo1-2/+2
2014-01-15increase Sauce concurrencyChris Rebert1-1/+1
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-32309827 Thanks @admc & @saucelabs !
2014-01-15Merge pull request #12243 from twbs/cleanup-aboutMark Otto4-38/+40
move Community & Translations docs sections from About to Getting Started
2014-01-15move Community & Translations docs sections from About to Getting StartedChris Rebert4-38/+40
2014-01-15Merge pull request #12242 from twbs/sass-contributingMark Otto1-1/+1
add link to Sass CONTRIBUTING file in the About page
2014-01-16Adhere to MailChimp's brand guidelines ;)Julian Thilo1-1/+1
2014-01-16Remove popovers from components.html leadJulian Thilo1-1/+1
because they're only really featured on javascript.html Replacement: input groups
2014-01-15add link to Sass CONTRIBUTING file in the About pageChris Rebert1-1/+1
2014-01-15remove inaccurate commentChris Rebert2-2/+0
2014-01-15Merge branch 'master' of github.com:twbs/bootstrapMark Otto3-3/+4
2014-01-15Fix page headersMark Otto2-11/+4
2014-01-15Getting Started: fix ID of heading so matches TOCChris Rebert1-1/+1
2014-01-15add a couple commasChris Rebert1-1/+1
2014-01-15Merge pull request #12241 from twbs/jekyll-encodingChris Rebert2-2/+3
Set Jekyll encoding and tweak Windows notes
2014-01-15indentation and page header changesMark Otto3-1528/+1499