]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Zlatan Vasović [Sun, 16 Feb 2014 18:28:43 +0000 (19:28 +0100)] 
Remove `curly: false` from `.jshintrc`
Chris Rebert [Sat, 1 Feb 2014 21:35:12 +0000 (13:35 -0800)] 
Merge pull request #12503 from ZDroid/ed
Don't re-set indent style for [*.py]
Zlatan Vasović [Sat, 1 Feb 2014 13:37:19 +0000 (14:37 +0100)]
Don't re-set indent style for [*.py]
Just inherit it from [*].
Chris Rebert [Fri, 31 Jan 2014 22:13:27 +0000 (14:13 -0800)]
Merge pull request #12480 from twbs/clarify-jquery-err-msg
Clarify JS error message about missing jQuery
Mark Otto [Fri, 31 Jan 2014 21:40:32 +0000 (13:40 -0800)] 
grunt after last commits
Mark Otto [Fri, 31 Jan 2014 21:39:23 +0000 (13:39 -0800)] 
Merge pull request #12448 from PHLAK/master
Fix issue causing .navbar-brand element height to be shorter than .navbar height
Mark Otto [Fri, 31 Jan 2014 21:12:31 +0000 (13:12 -0800)]
Use scss option instead of css for better highlighting
Chris Rebert [Fri, 31 Jan 2014 18:32:32 +0000 (10:32 -0800)]
fix #12484
Chris Rebert [Fri, 31 Jan 2014 17:50:45 +0000 (09:50 -0800)] 
most of Bootstrap's components are pure CSS and thus don't require jQuery
Refs https://news.ycombinator.com/item?id=
7156305
Chris Rebert [Fri, 31 Jan 2014 08:40:43 +0000 (00:40 -0800)]
Merge pull request #12463 from XhmikosR/12440
Downgrade holder.js to v2.2.0.
XhmikosR [Fri, 31 Jan 2014 07:26:11 +0000 (09:26 +0200)] 
Downgrade holder.js to v2.2.0.
Fixes #12440.
Chris Rebert [Fri, 31 Jan 2014 04:39:12 +0000 (20:39 -0800)]
fix "pading-right" [sic] typo in dashboard.css; fixes #12455
Chris Rebert [Thu, 30 Jan 2014 22:46:58 +0000 (14:46 -0800)]
use correct+newer name for retina mixin in docs; fixes #12450
Chris Kankiewicz [Thu, 30 Jan 2014 21:59:54 +0000 (14:59 -0700)] 
Fix issue causing .navbar-brand element height to be shorter than .navbar height
Chris Rebert [Thu, 30 Jan 2014 21:01:07 +0000 (13:01 -0800)]
Merge pull request #12445 from twbs/browserstack-runner-update
update to browserstack-runner v0.1.0
Chris Rebert [Thu, 30 Jan 2014 21:00:46 +0000 (13:00 -0800)]
Merge pull request #12444 from twbs/grunt-saucelabs-update
update to grunt-saucelabs v5.0.0
Chris Rebert [Thu, 30 Jan 2014 20:32:30 +0000 (12:32 -0800)]
update to browserstack-runner v0.1.0
Chris Rebert [Thu, 30 Jan 2014 20:30:55 +0000 (12:30 -0800)]
update to grunt-saucelabs v5.0.0
Chris Rebert [Thu, 30 Jan 2014 20:24:45 +0000 (12:24 -0800)]
rm duplicate warning callouts in Input Groups docs
Julian Thilo [Thu, 30 Jan 2014 20:16:48 +0000 (21:16 +0100)] 
Apply
eaa2b83 to master as well
Chris Rebert [Thu, 30 Jan 2014 19:12:40 +0000 (11:12 -0800)]
Merge pull request #12436 from XhmikosR/jquery
Update jQuery to v1.11.0.
XhmikosR [Thu, 30 Jan 2014 17:55:11 +0000 (19:55 +0200)]
Update jQuery to v1.11.0.
Also, use Google's CDN per #11369.
Chris Rebert [Thu, 30 Jan 2014 18:49:43 +0000 (10:49 -0800)]
rm outdated note about lack of .col-{xs,sm}-offset-0; fixes #12439
Chris Rebert [Thu, 30 Jan 2014 18:42:44 +0000 (10:42 -0800)]
note specific versions of IE where progress bar animation supported; fixes #12437
Mark Otto [Thu, 30 Jan 2014 16:30:37 +0000 (08:30 -0800)]
Bump versions, run grunt
Mark Otto [Thu, 30 Jan 2014 16:14:18 +0000 (08:14 -0800)]
grunt
Julian Thilo [Thu, 30 Jan 2014 12:54:19 +0000 (04:54 -0800)]
Merge pull request #12432 from ChrisRiddell/signin-email-fix
Wrong input css for signin example
Chris Riddell [Thu, 30 Jan 2014 12:44:05 +0000 (23:14 +1030)] 
its an email input
Mark Otto [Thu, 30 Jan 2014 06:44:06 +0000 (22:44 -0800)]
grunt
Mark Otto [Thu, 30 Jan 2014 06:18:29 +0000 (22:18 -0800)]
Merge branch 'master' into pr/12388
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Thu, 30 Jan 2014 05:57:44 +0000 (21:57 -0800)]
Follow up to #11655: don't reset opacity on disabled buttons
Mark Otto [Thu, 30 Jan 2014 05:44:36 +0000 (21:44 -0800)]
fix css url
Mark Otto [Thu, 30 Jan 2014 05:44:01 +0000 (21:44 -0800)]
Merge pull request #12423 from ZDroid/name
Rename pack.min.css to docs.min.css to match with docs.min.js
Mark Otto [Thu, 30 Jan 2014 05:34:10 +0000 (21:34 -0800)]
Fix #12422: Reset height on multiple select in input size mixin
Mark Otto [Thu, 30 Jan 2014 05:23:23 +0000 (21:23 -0800)]
Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over
Zlatan Vasović [Wed, 29 Jan 2014 19:50:10 +0000 (20:50 +0100)]
Rename pack.min.css to docs.min.css to match with docs.min.js
Chris Rebert [Wed, 29 Jan 2014 01:35:09 +0000 (17:35 -0800)]
Merge pull request #12415 from XhmikosR/master
Gruntfile.js: remove unused code.
Chris Rebert [Tue, 28 Jan 2014 23:54:23 +0000 (15:54 -0800)]
Merge pull request #12417 from ZDroid/cmt
Remove redundant jshint comment
Zlatan Vasović [Tue, 28 Jan 2014 21:47:23 +0000 (22:47 +0100)]
Remove redundant jshint comment
XhmikosR [Tue, 28 Jan 2014 11:16:13 +0000 (13:16 +0200)]
Gruntfile.js: remove unused code.
Mark Otto [Tue, 28 Jan 2014 18:57:31 +0000 (10:57 -0800)]
Merge pull request #12406 from twbs/normalize_v3
Upgrade to Normalize v3
Mark Otto [Tue, 28 Jan 2014 18:08:40 +0000 (10:08 -0800)]
grunt
Mark Otto [Tue, 28 Jan 2014 18:07:33 +0000 (10:07 -0800)]
v3 instead of rc1
Julian Thilo [Mon, 27 Jan 2014 23:01:10 +0000 (00:01 +0100)]
Update javascript.html
Julian Thilo [Mon, 27 Jan 2014 22:07:14 +0000 (23:07 +0100)]
Fix typo
Mark Otto [Mon, 27 Jan 2014 20:25:39 +0000 (12:25 -0800)]
Remove #8350's reset for number inputs since Normalize fixes those upstream
Mark Otto [Mon, 27 Jan 2014 20:24:35 +0000 (12:24 -0800)]
Remove optgroup resets from #7611 since Normalize fixes those upstream
Mark Otto [Mon, 27 Jan 2014 20:08:55 +0000 (12:08 -0800)]
Upgrade to Normalize v3-rc1 in prep for v3 final
Mark Otto [Mon, 27 Jan 2014 17:42:33 +0000 (09:42 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 27 Jan 2014 17:24:51 +0000 (09:24 -0800)]
document id requirement in carousels per #12393
Julian Thilo [Mon, 27 Jan 2014 17:22:17 +0000 (09:22 -0800)]
Merge pull request #12403 from Quy/master
Change positioning reference from left to right in affix's example.
Quy Ton [Mon, 27 Jan 2014 17:17:57 +0000 (09:17 -0800)] 
Change positioning reference from left to right in affix's example.
Chris Rebert [Mon, 27 Jan 2014 04:46:14 +0000 (20:46 -0800)]
Merge pull request #12315 from twbs/use-shrinkwrap
Do npm caching based on npm-shrinkwrap.canonical.json
Mark Otto [Mon, 27 Jan 2014 03:15:31 +0000 (19:15 -0800)]
Merge pull request #12398 from twbs/deprecate-box-shadow-mixin
mark .box-shadow() mixin as deprecated
Chris Rebert [Mon, 27 Jan 2014 01:48:15 +0000 (17:48 -0800)]
docs & comments: v3.1 => v3.1.0
Chris Rebert [Mon, 27 Jan 2014 01:31:11 +0000 (17:31 -0800)]
mark .box-shadow() mixin as deprecated; fixes #12396
Chris Rebert [Mon, 20 Jan 2014 21:06:13 +0000 (13:06 -0800)]
fix #12261
Alan Hamlett [Sun, 26 Jan 2014 05:40:56 +0000 (21:40 -0800)] 
fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height
Chris Rebert [Sun, 26 Jan 2014 02:33:23 +0000 (18:33 -0800)]
Merge pull request #12387 from twbs/osx-chrome
re-enable OS X Chrome in Sauce tests
Chris Rebert [Sun, 26 Jan 2014 01:55:52 +0000 (17:55 -0800)]
re-enable OS X Chrome in Sauce tests
Chris Rebert [Sun, 26 Jan 2014 01:11:49 +0000 (17:11 -0800)]
Merge pull request #12386 from twbs/update-iphone
update to iOS v7 in Sauce test config
Chris Rebert [Sun, 26 Jan 2014 00:47:55 +0000 (16:47 -0800)]
update to iOS v7 in Sauce test config
Chris Rebert [Sun, 26 Jan 2014 00:38:47 +0000 (16:38 -0800)]
README: use Bootstrap v3-specific StackOverflow tag
Chris Rebert [Sun, 26 Jan 2014 00:35:13 +0000 (16:35 -0800)]
disable IE11 in BrowserStack config due to frequent timeouts
Chris Rebert [Sun, 26 Jan 2014 00:30:02 +0000 (16:30 -0800)]
Merge pull request #12378 from andrewdisley/patch-1
Fix #10348: Customizer dependencies
Chris Rebert [Sun, 26 Jan 2014 00:27:05 +0000 (16:27 -0800)]
Merge pull request #12385 from hnrch02/update-load-grunt-tasks
Update load-grunt-tasks to v0.3.0
Heinrich Fenkart [Sat, 25 Jan 2014 20:03:44 +0000 (21:03 +0100)] 
Update load-grunt-tasks to v0.3.0
Chris Rebert [Sat, 25 Jan 2014 20:00:10 +0000 (12:00 -0800)]
Merge pull request #12266 from twbs/linux
enable Linux Chrome & Linux Firefox in Sauce tests
Mark Otto [Sat, 25 Jan 2014 19:10:20 +0000 (11:10 -0800)]
Merge pull request #12380 from twbs/translation-german
Add German translation
Julian Thilo [Sat, 25 Jan 2014 15:08:15 +0000 (16:08 +0100)]
Add link to German translation and reorder links
Andrew Disley [Sat, 25 Jan 2014 12:35:46 +0000 (12:35 +0000)] 
Fix #10348: Customizer dependencies
Mark Otto [Sat, 25 Jan 2014 06:36:05 +0000 (22:36 -0800)]
Merge pull request #12366 from Quy/master
Change a word.
Julian Thilo [Sat, 25 Jan 2014 00:58:54 +0000 (01:58 +0100)]
Clarify nesting in grid example
Quy Ton [Fri, 24 Jan 2014 19:24:50 +0000 (11:24 -0800)]
Change a word.
Chris Rebert [Fri, 24 Jan 2014 18:43:06 +0000 (10:43 -0800)]
Merge pull request #12365 from Quy/master
Remove Twitter from tweet button
Quy Ton [Fri, 24 Jan 2014 18:37:12 +0000 (10:37 -0800)]
Remove Twitter from tweet button
Mark Otto [Fri, 24 Jan 2014 17:56:04 +0000 (11:56 -0600)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 24 Jan 2014 17:55:59 +0000 (11:55 -0600)]
Fix #12359: Reset min-width on fieldsets so that they don't break responsive tables and behave more like standard block level elements
Chris Rebert [Fri, 24 Jan 2014 04:57:45 +0000 (20:57 -0800)]
Merge pull request #12357 from twbs/border-box-note
add note in Less source about global `box-sizing: border-box;`
Mark Otto [Fri, 24 Jan 2014 04:55:39 +0000 (20:55 -0800)]
Merge pull request #12356 from twbs/wcag-contributing
add WCAG color guideline to CONTRIBUTING.md
Mark Otto [Fri, 24 Jan 2014 04:53:33 +0000 (20:53 -0800)]
Merge pull request #12355 from twbs/aria-contributing
add WAI-ARIA guideline to CONTRIBUTING.md
Mark Otto [Fri, 24 Jan 2014 04:52:26 +0000 (22:52 -0600)]
Fix #12353: Scope table border reset in panels to first-child rows
Chris Rebert [Fri, 24 Jan 2014 01:23:57 +0000 (17:23 -0800)]
Add ref in Less to docs regarding box-sizing conflicts
Refs #12351
Chris Rebert [Fri, 24 Jan 2014 01:01:43 +0000 (17:01 -0800)]
add ID to "Box sizing" section of Getting Started docs
Chris Rebert [Thu, 23 Jan 2014 23:07:04 +0000 (15:07 -0800)]
"bottom increment" => "decrement" in explanatory comment
Chris Rebert [Thu, 23 Jan 2014 22:01:59 +0000 (14:01 -0800)]
add WCAG color guideline to CONTRIBUTING.md
Chris Rebert [Thu, 23 Jan 2014 20:50:57 +0000 (12:50 -0800)]
add WAI-ARIA guideline to CONTRIBUTING.md
Chris Rebert [Thu, 23 Jan 2014 19:18:56 +0000 (11:18 -0800)]
fix typo and use the v3-specific StackOverflow tag
Chris Rebert [Thu, 23 Jan 2014 05:34:42 +0000 (21:34 -0800)]
Merge pull request #12347 from twbs/ie-11-browserstack
enable IE11 in BrowserStack tests
Mark Otto [Thu, 23 Jan 2014 03:51:23 +0000 (21:51 -0600)]
Follow-up to #12250: remove remaining page margins for print
Mark Otto [Thu, 23 Jan 2014 03:43:08 +0000 (21:43 -0600)]
Fix #11655: Fix broken disabled states for iOS form controls and buttons
Mark Otto [Thu, 23 Jan 2014 03:20:06 +0000 (21:20 -0600)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 23 Jan 2014 03:18:24 +0000 (19:18 -0800)]
Merge pull request #12250 from twbs/rm-print-margins
remove default left-right print margins per upstream h5bp change
Mark Otto [Thu, 23 Jan 2014 03:15:25 +0000 (21:15 -0600)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 23 Jan 2014 03:15:17 +0000 (21:15 -0600)]
Fixes #12344: Update docs to show workaround for using button element with justified button groups
Mark Otto [Thu, 23 Jan 2014 01:52:00 +0000 (17:52 -0800)]
Merge pull request #12345 from twbs/printer-wackiness-note
add note about printer viewport weirdness
Chris Rebert [Wed, 22 Jan 2014 23:45:29 +0000 (15:45 -0800)]
add docs note to address #12078
Chris Rebert [Fri, 17 Jan 2014 02:18:18 +0000 (18:18 -0800)]
enable IE11 in BrowserStack tests
Julian Thilo [Wed, 22 Jan 2014 18:04:19 +0000 (19:04 +0100)]
No more lists.
Julian Thilo [Wed, 22 Jan 2014 16:46:41 +0000 (08:46 -0800)]
Merge pull request #12340 from browserstack/update_bs_runner
Update browserstack-runner package
projects / thirdparty / bootstrap.git / log
