]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years ago'use strict' on new line 12057/head
Zlatan Vasović [Wed, 1 Jan 2014 14:42:41 +0000 (15:42 +0100)] 
'use strict' on new line

11 years agoUpdate Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task...
Mark Otto [Wed, 1 Jan 2014 02:21:41 +0000 (18:21 -0800)] 
Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state

11 years agoFix broken JS
Mark Otto [Wed, 1 Jan 2014 01:47:16 +0000 (17:47 -0800)] 
Fix broken JS

11 years agoderp
Mark Otto [Tue, 31 Dec 2013 21:57:35 +0000 (13:57 -0800)] 
derp

11 years agoMerge pull request #12037 from twbs/docs_dir
Mark Otto [Tue, 31 Dec 2013 21:43:32 +0000 (13:43 -0800)] 
Merge pull request #12037 from twbs/docs_dir

Bring back the `/docs` directory

11 years agoMerge branch 'master' into docs_dir 12037/head
Mark Otto [Tue, 31 Dec 2013 21:43:11 +0000 (13:43 -0800)] 
Merge branch 'master' into docs_dir

11 years agoFixes #12046: move .csscomb.json and .csslintrc to less/ folder
Mark Otto [Tue, 31 Dec 2013 21:16:28 +0000 (13:16 -0800)] 
Fixes #12046: move .csscomb.json and .csslintrc to less/ folder

11 years agoMerge pull request #12049 from ZDroid/update-de
Mark Otto [Tue, 31 Dec 2013 20:57:55 +0000 (12:57 -0800)] 
Merge pull request #12049 from ZDroid/update-de

Update dependencies (again)

11 years agotypo
Mark Otto [Tue, 31 Dec 2013 19:57:44 +0000 (11:57 -0800)] 
typo

11 years ago@nschonni's feedback <3
Mark Otto [Tue, 31 Dec 2013 19:38:32 +0000 (11:38 -0800)] 
@nschonni's feedback <3

11 years ago@cvrebert's feedback
Mark Otto [Tue, 31 Dec 2013 18:51:39 +0000 (10:51 -0800)] 
@cvrebert's feedback

11 years agoMerge branch 'master' into docs_dir
Mark Otto [Tue, 31 Dec 2013 18:38:31 +0000 (10:38 -0800)] 
Merge branch 'master' into docs_dir

11 years agoUpdate dependencies (again) 12049/head
Zlatan Vasović [Tue, 31 Dec 2013 18:20:57 +0000 (19:20 +0100)] 
Update dependencies (again)

11 years agoMerge pull request #12043 from supergibbs/fixed_typo_in_customize.html
Chris Rebert [Mon, 30 Dec 2013 07:26:57 +0000 (23:26 -0800)] 
Merge pull request #12043 from supergibbs/fixed_typo_in_customize.html

Fixed typo

11 years agoFixed typo 12043/head
Supergibbs [Mon, 30 Dec 2013 07:16:41 +0000 (23:16 -0800)] 
Fixed typo

11 years agoSauce now supports latest Firefox on OS X Mavericks
Chris Rebert [Mon, 30 Dec 2013 05:15:29 +0000 (21:15 -0800)] 
Sauce now supports latest Firefox on OS X Mavericks

11 years agodefault to latest Firefox version on OS X
Chris Rebert [Mon, 30 Dec 2013 05:13:56 +0000 (21:13 -0800)] 
default to latest Firefox version on OS X

11 years agofix capitalization of iOS
Chris Rebert [Mon, 30 Dec 2013 04:45:36 +0000 (20:45 -0800)] 
fix capitalization of iOS

11 years agoMerge pull request #12041 from twbs/mv-sauce-into-infra
Chris Rebert [Mon, 30 Dec 2013 04:29:44 +0000 (20:29 -0800)] 
Merge pull request #12041 from twbs/mv-sauce-into-infra

mv sauce_browsers.yml out of the project root

11 years agomv sauce_browsers.yml out of the project root 12041/head
Chris Rebert [Mon, 30 Dec 2013 04:25:40 +0000 (20:25 -0800)] 
mv sauce_browsers.yml out of the project root

11 years agoadd note about ios dropdown compat
fat [Mon, 30 Dec 2013 03:40:31 +0000 (19:40 -0800)] 
add note about ios dropdown compat

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
fat [Mon, 30 Dec 2013 03:25:24 +0000 (19:25 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #12036 from ZDroid/grunt-fs-minify
Chris Rebert [Mon, 30 Dec 2013 03:23:57 +0000 (19:23 -0800)] 
Merge pull request #12036 from ZDroid/grunt-fs-minify

Merge two fs variable declarations into one

11 years agoMerge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee...
fat [Mon, 30 Dec 2013 03:23:15 +0000 (19:23 -0800)] 
Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles

Conflicts:
js/dropdown.js

11 years agofixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')
fat [Mon, 30 Dec 2013 03:01:32 +0000 (19:01 -0800)] 
fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')

11 years agofixes #11373 - adds related target to dropdown events
fat [Mon, 30 Dec 2013 02:57:22 +0000 (18:57 -0800)] 
fixes #11373 - adds related target to dropdown events

11 years agoMerge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap...
fat [Mon, 30 Dec 2013 02:04:43 +0000 (18:04 -0800)] 
Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top

Conflicts:
dist/js/bootstrap.min.js

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
fat [Mon, 30 Dec 2013 01:54:40 +0000 (17:54 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #11288 - Vertical scroll position of modal saves between openings
fat [Mon, 30 Dec 2013 01:53:59 +0000 (17:53 -0800)] 
fixes #11288 - Vertical scroll position of modal saves between openings

11 years agono more page.base_url
Mark Otto [Sun, 29 Dec 2013 07:08:46 +0000 (23:08 -0800)] 
no more page.base_url

11 years agoStreamline copy process by not bringing over full files into docs/dist/, only take...
Mark Otto [Sun, 29 Dec 2013 07:05:02 +0000 (23:05 -0800)] 
Streamline copy process by not bringing over full files into docs/dist/, only take minified ones

11 years agoRearrange repository contents because muahahahahahaha
Mark Otto [Sun, 29 Dec 2013 06:47:03 +0000 (22:47 -0800)] 
Rearrange repository contents because muahahahahahaha

11 years agoMerge pull request #11203 from jasny/patch-1
Jacob [Sun, 29 Dec 2013 06:06:26 +0000 (22:06 -0800)] 
Merge pull request #11203 from jasny/patch-1

Scrollspy acting up when targets are hidden

11 years agofixes #10658 jQuery Popover content loses bound events on second setContent call.
fat [Sun, 29 Dec 2013 04:59:45 +0000 (20:59 -0800)] 
fixes #10658 jQuery Popover content loses bound events on second setContent call.

11 years agodrop the title
Mark Otto [Sun, 29 Dec 2013 02:47:32 +0000 (18:47 -0800)] 
drop the title

11 years agoMerge pull request #12035 from tomByrer/master
Mark Otto [Sun, 29 Dec 2013 02:46:36 +0000 (18:46 -0800)] 
Merge pull request #12035 from tomByrer/master

fixed .clearfix example, + doc link

11 years agoMerge two fs variable declarations into one 12036/head
Zlatan Vasović [Sat, 28 Dec 2013 22:33:32 +0000 (23:33 +0100)] 
Merge two fs variable declarations into one

One is enough.

11 years agofixed .clearfix example, + doc link 12035/head
tomByrer [Sat, 28 Dec 2013 19:01:32 +0000 (12:01 -0700)] 
fixed .clearfix example, + doc link

11 years agogrunt on last merge
Mark Otto [Sat, 28 Dec 2013 00:41:25 +0000 (16:41 -0800)] 
grunt on last merge

11 years agoMerge pull request #12028 from moshevds/deprecated-screen-md
Mark Otto [Fri, 27 Dec 2013 20:40:02 +0000 (12:40 -0800)] 
Merge pull request #12028 from moshevds/deprecated-screen-md

Small fix: I noticed the use of a deprecated variable.

11 years agoSmall fix: I noticed the use of a deprecated variable. This seems to be the only... 12028/head
Môshe van der Sterre [Fri, 27 Dec 2013 20:27:51 +0000 (21:27 +0100)] 
Small fix: I noticed the use of a deprecated variable. This seems to be the only occurrence.

11 years agoupdate accordion-group to panel
fat [Fri, 27 Dec 2013 04:33:44 +0000 (20:33 -0800)] 
update accordion-group to panel

11 years agofixes #10911 - add loading event for use with remote option :|
fat [Fri, 27 Dec 2013 04:26:27 +0000 (20:26 -0800)] 
fixes #10911 - add loading event for use with remote option :|

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
fat [Fri, 27 Dec 2013 03:40:41 +0000 (19:40 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #10890
fat [Fri, 27 Dec 2013 03:40:18 +0000 (19:40 -0800)] 
fixes #10890

11 years agoless fun to address #12008
Mark Otto [Fri, 27 Dec 2013 03:37:19 +0000 (19:37 -0800)] 
less fun to address #12008

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 27 Dec 2013 03:08:34 +0000 (19:08 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #12012: Use correct banner in docs js
Mark Otto [Fri, 27 Dec 2013 03:08:19 +0000 (19:08 -0800)] 
Fixes #12012: Use correct banner in docs js

11 years agorebuild
fat [Fri, 27 Dec 2013 02:30:16 +0000 (18:30 -0800)] 
rebuild

11 years agoupdate tool/pop destroy placement
fat [Fri, 27 Dec 2013 02:27:43 +0000 (18:27 -0800)] 
update tool/pop destroy placement

11 years agoMerge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy
Jacob [Fri, 27 Dec 2013 02:25:29 +0000 (18:25 -0800)] 
Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy

don't create new Tooltip/Popover objects just to destroy them immediately

11 years agonope
fat [Fri, 27 Dec 2013 02:18:53 +0000 (18:18 -0800)] 
nope

11 years agoMerge pull request #11496 from satazor/patch-1
Jacob [Fri, 27 Dec 2013 02:18:09 +0000 (18:18 -0800)] 
Merge pull request #11496 from satazor/patch-1

Clear timeout on destroy.

11 years agofixes #10798
fat [Fri, 27 Dec 2013 01:53:31 +0000 (17:53 -0800)] 
fixes #10798

11 years agoMerge pull request #10801 from Travesty3/master
Jacob [Fri, 27 Dec 2013 01:50:41 +0000 (17:50 -0800)] 
Merge pull request #10801 from Travesty3/master

Add 'collapse' class back after expanding

11 years agoMerge pull request #10834 from Prinzhorn/master
Jacob [Fri, 27 Dec 2013 01:46:59 +0000 (17:46 -0800)] 
Merge pull request #10834 from Prinzhorn/master

Only preventDefault on click on [data-toggle="modal"] when the element is a link

11 years agoadd Python indentation style to editorconfig; refs #12023
Chris Rebert [Thu, 26 Dec 2013 21:44:27 +0000 (13:44 -0800)] 
add Python indentation style to editorconfig; refs #12023

11 years agoMerge pull request #12009 from ZDroid/no-utf8-py
Chris Rebert [Thu, 26 Dec 2013 21:28:22 +0000 (13:28 -0800)] 
Merge pull request #12009 from ZDroid/no-utf8-py

Replace UTF-8 characters in s3_cache.py with ASCII characters

11 years agoMerge pull request #12022 from ZDroid/update-deps
Chris Rebert [Thu, 26 Dec 2013 21:16:13 +0000 (13:16 -0800)] 
Merge pull request #12022 from ZDroid/update-deps

Update dependencies

11 years agoUpdate dependencies 12022/head
Zlatan Vasović [Thu, 26 Dec 2013 20:55:55 +0000 (21:55 +0100)] 
Update dependencies

Updates grunt-html-validation and grunt-jekyll dependencies.

11 years agoMerge pull request #12010 from ZDroid/wrong-indent
Mark Otto [Thu, 26 Dec 2013 20:54:23 +0000 (12:54 -0800)] 
Merge pull request #12010 from ZDroid/wrong-indent

Fix wrong indent in .jscs.json

11 years agoMerge pull request #12021 from XhmikosR/master
Chris Rebert [Thu, 26 Dec 2013 20:32:34 +0000 (12:32 -0800)] 
Merge pull request #12021 from XhmikosR/master

Add docs-assets/css/docs.css to csslint too.

11 years agoMerge pull request #12019 from XhmikosR/badge
Julian Thilo [Thu, 26 Dec 2013 18:58:23 +0000 (10:58 -0800)] 
Merge pull request #12019 from XhmikosR/badge

Change david-dm theme to make README badges uniform

11 years agoMerge pull request #12020 from XhmikosR/package
Chris Rebert [Thu, 26 Dec 2013 18:52:38 +0000 (10:52 -0800)] 
Merge pull request #12020 from XhmikosR/package

Update dependencies.

11 years agoUpdate dependencies. 12020/head
XhmikosR [Thu, 26 Dec 2013 17:50:04 +0000 (19:50 +0200)] 
Update dependencies.

11 years agoREADME.md: switch to the shields.io dependency badges theme. 12019/head
XhmikosR [Thu, 26 Dec 2013 17:51:10 +0000 (19:51 +0200)] 
README.md: switch to the shields.io dependency badges theme.

11 years agoAdd docs-assets/css/docs.css to csslint too. 12021/head
XhmikosR [Tue, 10 Dec 2013 14:11:08 +0000 (16:11 +0200)] 
Add docs-assets/css/docs.css to csslint too.

11 years agofixes #10675
fat [Thu, 26 Dec 2013 04:33:05 +0000 (20:33 -0800)] 
fixes #10675

11 years agobuild js
fat [Thu, 26 Dec 2013 04:04:49 +0000 (20:04 -0800)] 
build js

11 years agoMerge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into...
fat [Thu, 26 Dec 2013 04:03:28 +0000 (20:03 -0800)] 
Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix

Conflicts:
js/tooltip.js

11 years agoFix wrong indent in .jscs.json 12010/head
Zlatan Vasović [Wed, 25 Dec 2013 19:22:52 +0000 (20:22 +0100)] 
Fix wrong indent in .jscs.json

11 years agoReplace UTF-8 characters in s3_cache.py with ASCII characters 12009/head
Zlatan Vasović [Wed, 25 Dec 2013 19:19:59 +0000 (20:19 +0100)] 
Replace UTF-8 characters in s3_cache.py with ASCII characters

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
fat [Wed, 25 Dec 2013 01:00:55 +0000 (17:00 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #11788 - focusin focusout instead of focus/blur
fat [Wed, 25 Dec 2013 01:00:34 +0000 (17:00 -0800)] 
fixes #11788 - focusin focusout instead of focus/blur

11 years agoMerge pull request #11722 from DocX/patch-1
Jacob [Wed, 25 Dec 2013 00:43:24 +0000 (16:43 -0800)] 
Merge pull request #11722 from DocX/patch-1

Use document scroll height instead of offset height

11 years agoadd docs for affix events
fat [Wed, 25 Dec 2013 00:37:53 +0000 (16:37 -0800)] 
add docs for affix events

11 years agofixes #11720 - Add events trigger to affix
fat [Wed, 25 Dec 2013 00:29:51 +0000 (16:29 -0800)] 
fixes #11720 - Add events trigger to affix

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
fat [Tue, 24 Dec 2013 21:43:47 +0000 (13:43 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agonote for #10486 add note about data-toggle dropdown dependency
fat [Tue, 24 Dec 2013 21:43:09 +0000 (13:43 -0800)] 
note for #10486 add note about data-toggle dropdown dependency

11 years agoMerge pull request #10359 from ixti/patch-1
Jacob [Tue, 24 Dec 2013 21:21:19 +0000 (13:21 -0800)] 
Merge pull request #10359 from ixti/patch-1

Pass $element to offset top/bottom calc funcs

11 years agofixes #10134 – dont use jquery offset directly because it uses sub pixel rendering
fat [Tue, 24 Dec 2013 21:07:42 +0000 (13:07 -0800)] 
fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering

11 years agoMerge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide...
fat [Tue, 24 Dec 2013 20:50:55 +0000 (12:50 -0800)] 
Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset

Conflicts:
js/tests/unit/carousel.js

11 years agofixes #10283
fat [Tue, 24 Dec 2013 20:40:24 +0000 (12:40 -0800)] 
fixes #10283

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
fat [Tue, 24 Dec 2013 20:35:24 +0000 (12:35 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js

11 years agofixes #10236
fat [Tue, 24 Dec 2013 20:32:06 +0000 (12:32 -0800)] 
fixes #10236
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load

11 years agoMerge pull request #12001 from soundarapandian/fix_typo_contributing
Mark Otto [Tue, 24 Dec 2013 20:24:07 +0000 (12:24 -0800)] 
Merge pull request #12001 from soundarapandian/fix_typo_contributing

Use correct directory name for bootstrap contribution

11 years agodon't roll back that comment
Mark Otto [Tue, 24 Dec 2013 20:18:53 +0000 (12:18 -0800)] 
don't roll back that comment

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 24 Dec 2013 20:17:48 +0000 (12:17 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
docs-assets/js/raw-files.js

11 years agoroll back version numbers to avoid broken links in docs and readme (fixes #12000)
Mark Otto [Tue, 24 Dec 2013 20:16:17 +0000 (12:16 -0800)] 
roll back version numbers to avoid broken links in docs and readme (fixes #12000)

11 years agoReflect sass readme change in css.html
Gleb Mazovetskiy [Tue, 24 Dec 2013 16:20:52 +0000 (17:20 +0100)] 
Reflect sass readme change in css.html

11 years agoUse correct directory name for bootstrap contribution 12001/head
soundarapandian [Tue, 24 Dec 2013 10:35:19 +0000 (16:05 +0530)] 
Use correct directory name for bootstrap contribution

11 years agoMerge pull request #11933 from twbs/fat-10105
Jacob [Tue, 24 Dec 2013 07:31:11 +0000 (23:31 -0800)] 
Merge pull request #11933 from twbs/fat-10105

change where modal loads content -– fixes #10105, #9318, #9459

11 years agochange where modal loads content -– fixes #10105, #9318, #9459 11933/head
fat [Thu, 19 Dec 2013 05:38:35 +0000 (21:38 -0800)] 
change where modal loads content -– fixes #10105, #9318, #9459

11 years agoMerge pull request #11999 from XhmikosR/respond.js
Mark Otto [Tue, 24 Dec 2013 07:26:05 +0000 (23:26 -0800)] 
Merge pull request #11999 from XhmikosR/respond.js

Update Respond.js

11 years agoUpdate Respond.js to v1.4.2. 11999/head
XhmikosR [Mon, 23 Dec 2013 17:23:07 +0000 (19:23 +0200)] 
Update Respond.js to v1.4.2.

11 years agofixes #10568 - kill hoverstate info once command has been executed
fat [Tue, 24 Dec 2013 06:57:39 +0000 (22:57 -0800)] 
fixes #10568 - kill hoverstate info once command has been executed

11 years agofixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be...
fat [Tue, 24 Dec 2013 06:08:43 +0000 (22:08 -0800)] 
fixes #10205 Scrollspy Doesn't Support Chinese ID Targets  http://mathiasbynens.be/notes/html5-id-class

11 years agoadd callout about justified button group borders to address #11964
Mark Otto [Tue, 24 Dec 2013 04:28:21 +0000 (20:28 -0800)] 
add callout about justified button group borders to address #11964

11 years agoMerge pull request #11970 from supergibbs/Better_10492_fix
Mark Otto [Tue, 24 Dec 2013 02:53:30 +0000 (18:53 -0800)] 
Merge pull request #11970 from supergibbs/Better_10492_fix

Fixes #10492 better

11 years agoFixes #10492 better: 11970/head
Supergibbs [Tue, 24 Dec 2013 00:07:55 +0000 (16:07 -0800)] 
Fixes #10492 better:
- Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped
- Supports tfoot