Chris Rebert
5f328dce88
Merge pull request #12057 from ZDroid/nl
...
'use strict' on new line
2014-01-07 00:31:27 -08:00
Julian Thilo
7fcfe61f4d
Update copyright notices in all places
...
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Kevin Sawicki
5141e4da10
Use $ instead of jQuery
2014-01-03 14:39:18 -08:00
Zlatan Vasović
0f060e7bc4
'use strict' on new line
2014-01-01 15:42:41 +01:00
Zlatan Vasović
1c83d68ca4
New Year
2014-01-01 15:37:08 +01:00
fat
2a0b99104c
Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles
...
Conflicts:
js/dropdown.js
2013-12-29 19:23:15 -08:00
fat
8a62f21113
fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')
2013-12-29 19:01:32 -08:00
fat
76f0d0ff32
fixes #11373 - adds related target to dropdown events
2013-12-29 18:57:22 -08:00
fat
162d9e1776
Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top
...
Conflicts:
dist/js/bootstrap.min.js
2013-12-29 18:04:43 -08:00
fat
9d73d9c38c
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-29 17:54:40 -08:00
fat
ce4a2e4352
fixes #11288 - Vertical scroll position of modal saves between openings
2013-12-29 17:53:59 -08:00
Jacob
ea40e7999d
Merge pull request #11203 from jasny/patch-1
...
Scrollspy acting up when targets are hidden
2013-12-28 22:06:26 -08:00
fat
5bf13914e4
fixes #10658 jQuery Popover content loses bound events on second setContent call.
2013-12-28 20:59:45 -08:00
fat
c595db19ff
fixes #10911 - add loading event for use with remote option :|
2013-12-26 20:26:27 -08:00
fat
d21369c1ed
fixes #10890
2013-12-26 19:40:18 -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
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
fat
fc7049b18f
fixes #10675
2013-12-25 20:33:05 -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
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
c77740bd3a
fixes #11720 - Add events trigger to affix
2013-12-24 16:29:51 -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
5c2dfbf33b
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
docs-assets/js/raw-files.js
2013-12-24 12:17:48 -08:00
Mark Otto
679c786237
roll back version numbers to avoid broken links in docs and readme ( fixes #12000 )
2013-12-24 12:16:17 -08:00
fat
fe839e6e78
change where modal loads content -– fixes #10105 , #9318 , #9459
2013-12-23 23:30:06 -08:00
fat
1fc08c1973
fixes #10568 - kill hoverstate info once command has been executed
2013-12-23 22:57:39 -08:00
fat
a87b150bc7
fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class
2013-12-23 22:08:43 -08:00
Mark Otto
45a8a9508e
Merge pull request #11974 from XhmikosR/meta
...
Normalize meta
2013-12-22 22:20:23 -08:00
XhmikosR
a05a11e5dc
Get rid of JSHint's laxcomma option now that the comma is used on the right side.
2013-12-22 09:02:08 +02:00
XhmikosR
6e3ac8f2a4
js/.jscs.json: sort by name.
2013-12-22 08:59:36 +02:00
Zlatan Vasović
1bf5abab31
No leading pluses
2013-12-19 15:32:37 +01:00
fat
22f9767714
check that href id's are followed by valid char – fixes #10044
2013-12-18 21:14:01 -08:00
Chris Rebert
df3716647d
update licensing header in JS files & run grunt
2013-12-18 15:29:19 -08:00
Mark Otto
b9ca65ebe7
Merge pull request #11416 from danielboendergaard/carousel-duration
...
Carousel: Use the transition duration from CSS
2013-12-18 15:01:47 -08:00
Mark Otto
e8e60ae4bc
version bump
2013-12-18 14:56:08 -08:00
Zlatan Vasović
ba3639b202
Require comma on left side
2013-12-16 18:06:31 +01:00
