Mark Otto
|
5b02dbd97a
|
Merge branch 'master' into docs_derp
Conflicts:
_config.yml
|
2013-12-26 21:40:15 -08:00 |
|
fat
|
201088cb5f
|
update accordion-group to panel
|
2013-12-26 20:33:44 -08:00 |
|
fat
|
c595db19ff
|
fixes #10911 - add loading event for use with remote option :|
|
2013-12-26 20:26:27 -08:00 |
|
fat
|
499cca2115
|
Merge branch 'master' of github.com:twbs/bootstrap
|
2013-12-26 19:40:41 -08:00 |
|
fat
|
d21369c1ed
|
fixes #10890
|
2013-12-26 19:40:18 -08:00 |
|
Mark Otto
|
d43eb0a513
|
less fun to address #12008
|
2013-12-26 19:37:19 -08:00 |
|
Mark Otto
|
ca7498faa0
|
Merge branch 'master' of github.com:twbs/bootstrap
|
2013-12-26 19:08:34 -08:00 |
|
Mark Otto
|
567dc12e86
|
Fixes #12012: Use correct banner in docs js
|
2013-12-26 19:08:19 -08:00 |
|
fat
|
cd0ad94aae
|
rebuild
|
2013-12-26 18:30:16 -08:00 |
|
fat
|
3c73904e17
|
update tool/pop destroy placement
|
2013-12-26 18:27:43 -08:00 |
|
Jacob
|
6baf266cda
|
Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy
don't create new Tooltip/Popover objects just to destroy them immediately
|
2013-12-26 18:25:29 -08:00 |
|
fat
|
39091b0748
|
nope
|
2013-12-26 18:18:53 -08:00 |
|
Jacob
|
bf3c525d05
|
Merge pull request #11496 from satazor/patch-1
Clear timeout on destroy.
|
2013-12-26 18:18:09 -08:00 |
|
fat
|
34fb5767cb
|
fixes #10798
|
2013-12-26 17:53:31 -08:00 |
|
Jacob
|
37bfd8fa60
|
Merge pull request #10801 from Travesty3/master
Add 'collapse' class back after expanding
|
2013-12-26 17:50:41 -08:00 |
|
Jacob
|
bea46fca70
|
Merge pull request #10834 from Prinzhorn/master
Only preventDefault on click on [data-toggle="modal"] when the element is a link
|
2013-12-26 17:46:59 -08:00 |
|
Chris Rebert
|
0bcc5a2814
|
add Python indentation style to editorconfig; refs #12023
|
2013-12-26 13:44:27 -08:00 |
|
Chris Rebert
|
be6ad3fda0
|
Merge pull request #12009 from ZDroid/no-utf8-py
Replace UTF-8 characters in s3_cache.py with ASCII characters
|
2013-12-26 13:28:22 -08:00 |
|
Chris Rebert
|
e0268c32cb
|
Merge pull request #12022 from ZDroid/update-deps
Update dependencies
|
2013-12-26 13:16:13 -08:00 |
|
Zlatan Vasović
|
2426a2aeef
|
Update dependencies
Updates grunt-html-validation and grunt-jekyll dependencies.
|
2013-12-26 21:55:55 +01:00 |
|
Mark Otto
|
d8e4c1578d
|
Merge pull request #12010 from ZDroid/wrong-indent
Fix wrong indent in .jscs.json
|
2013-12-26 12:54:23 -08:00 |
|
Chris Rebert
|
e4b036d278
|
Merge pull request #12021 from XhmikosR/master
Add docs-assets/css/docs.css to csslint too.
|
2013-12-26 12:32:34 -08:00 |
|
Julian Thilo
|
1e938f1781
|
Merge pull request #12019 from XhmikosR/badge
Change david-dm theme to make README badges uniform
|
2013-12-26 10:58:23 -08:00 |
|
Chris Rebert
|
1e6ae57575
|
Merge pull request #12020 from XhmikosR/package
Update dependencies.
|
2013-12-26 10:52:38 -08:00 |
|
XhmikosR
|
b590b268ad
|
Update dependencies.
|
2013-12-26 19:54:04 +02:00 |
|
XhmikosR
|
5cb8510a81
|
README.md: switch to the shields.io dependency badges theme.
|
2013-12-26 19:52:39 +02:00 |
|
XhmikosR
|
5eab9cbe82
|
Add docs-assets/css/docs.css to csslint too.
|
2013-12-26 19:49:33 +02:00 |
|
fat
|
fc7049b18f
|
fixes #10675
|
2013-12-25 20:33:05 -08:00 |
|
fat
|
3161acd710
|
build js
|
2013-12-25 20:04:49 -08:00 |
|
fat
|
c25fa0661a
|
Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix
Conflicts:
js/tooltip.js
|
2013-12-25 20:03:28 -08:00 |
|
Zlatan Vasović
|
1e05029d1a
|
Fix wrong indent in .jscs.json
|
2013-12-25 20:22:52 +01:00 |
|
Zlatan Vasović
|
d381771f6a
|
Replace UTF-8 characters in s3_cache.py with ASCII characters
|
2013-12-25 20:19:59 +01:00 |
|
Mark Otto
|
3fdde76b74
|
don't be repetitive on homepage
|
2013-12-25 14:32:00 +02:00 |
|
Mark Otto
|
e29a3b65cd
|
Merge branch 'master' of github.com:twbs/bootstrap
|
2014-01-22 15:37:11 -06:00 |
|
Mark Otto
|
d1f69d4a7e
|
scope styles to masthead, not homepage
|
2014-01-22 15:37:05 -06:00 |
|
fat
|
dffd4ffad2
|
Merge branch 'master' of github.com:twbs/bootstrap
|
2013-12-24 17:00:55 -08:00 |
|
fat
|
394e0fa611
|
fixes #11788 - focusin focusout instead of focus/blur
|
2013-12-24 17:00:34 -08:00 |
|
Jacob
|
0fab6e7ea7
|
Merge pull request #11722 from DocX/patch-1
Use document scroll height instead of offset height
|
2013-12-24 16:43:24 -08:00 |
|
fat
|
d9266aee96
|
add docs for affix events
|
2013-12-24 16:37:53 -08:00 |
|
fat
|
c77740bd3a
|
fixes #11720 - Add events trigger to affix
|
2013-12-24 16:29:51 -08:00 |
|
fat
|
073f8c049d
|
Merge branch 'master' of github.com:twbs/bootstrap
|
2013-12-24 13:43:47 -08:00 |
|
fat
|
f689a26a1c
|
note for #10486 add note about data-toggle dropdown dependency
|
2013-12-24 13:43:09 -08:00 |
|
Jacob
|
139b395dfb
|
Merge pull request #10359 from ixti/patch-1
Pass $element to offset top/bottom calc funcs
|
2013-12-24 13:21:19 -08:00 |
|
fat
|
a93a753c7d
|
fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering
|
2013-12-24 13:07:42 -08:00 |
|
fat
|
fe7fffe034
|
Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
Conflicts:
js/tests/unit/carousel.js
|
2013-12-24 12:50:55 -08:00 |
|
fat
|
0a75e4c09b
|
fixes #10283
|
2013-12-24 12:40:24 -08:00 |
|
fat
|
558b6a478d
|
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
|
2013-12-24 12:35:24 -08:00 |
|
fat
|
50bd4edb8c
|
fixes #10236
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
|
2013-12-24 12:32:06 -08:00 |
|
Mark Otto
|
1da3a8c6b1
|
Merge pull request #12001 from soundarapandian/fix_typo_contributing
Use correct directory name for bootstrap contribution
|
2013-12-24 12:24:07 -08:00 |
|
Mark Otto
|
04ec4354ed
|
don't roll back that comment
|
2013-12-24 12:18:53 -08:00 |
|