sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-11-04 00:03:15 -05:00
Code Issues Projects Releases Wiki Activity
16,185 Commits 125 Branches 94 Tags
Commit Graph

1343 Commits

Author SHA1 Message Date
Mark Otto
95cb6f07a8 Merge branch 'zerkms-master' into 2.0.2-wip 
Conflicts:
	Makefile
 2012-03-11 17:38:23 -07:00
Ivan Kurnosov
354252b4b5 Grammar fix in js/README.md 2012-03-12 10:24:18 +13:00
Jacob Thornton
26e683f1d0 Merge pull request #2177 from phopkins/typeahead_friendly 
[2.0.2-wip] Typeahead friendly
 2012-03-08 11:14:56 -08:00
Jacob Thornton
43760eb202 fix for @pamelafox and #1861 2012-02-24 22:17:36 -08:00
Jacob Thornton
fb74018ae2 and pause on hover option to carousel 2012-02-24 21:51:39 -08:00
Pete Hopkins
3a6f58598c Allows escape to bubble when menu isn't shown 2012-02-22 14:19:55 -05:00
Pete Hopkins
70fecd1115 Fires change event when element is selected from menu 2012-02-22 14:19:55 -05:00
Pete Hopkins
80d03e143c Allow events to propagate / default if not used. 
- All key events when the menu is not shown now propagate.
 - Blur is also allowed to propagate.
 2012-02-22 14:19:55 -05:00
Jacob Thornton
f046c12bd2 fix cycling in carousel 2012-02-20 22:01:38 -08:00
Jacob Thornton
3d58b46226 fix bootstrap-button toggle regression + tests 2012-02-18 23:29:58 -08:00
Jacob Thornton
7ec09d0db9 2.0.1 2012-02-16 22:42:38 -08:00
Jacob Thornton
9d12b2d601 don't try next if not next 2012-02-16 20:43:57 -08:00
Jacob Thornton
e730f8adb5 null out interval so that pause doesn't resume on next or prev 2012-02-16 20:22:01 -08:00
Jacob Thornton
792059b7ad fix alerts 2012-02-16 20:04:26 -08:00
Jacob Thornton
6e77c9d123 add semicolons to the end of js files 2012-02-13 18:41:02 -08:00
Jacob Thornton
5b4a29d84e honor data attributes set on modal as well 2012-02-12 11:15:12 -08:00
Jacob Thornton
139a077543 don't use e.target incase button has icon or other content inside it 2012-02-07 21:55:27 -08:00
Mark Otto
a10c23f1aa Merge branch 'CaryLandholt-master' into 2.0.1-wip 2012-02-06 23:42:02 -08:00
Mark Otto
6325402372 Merge branch 'master' of https://github.com/CaryLandholt/bootstrap into CaryLandholt-master 2012-02-06 23:41:53 -08:00
raphaelz
3722bb9a88 Grammatical changes have been made as suggested by @cvrebert for issue #1787. 2012-02-07 02:11:25 -05:00
Jacob Thornton
c8c4d5b392 fix alert tests + add show option back to modals 2012-02-06 00:17:31 -08:00
Cary Landholt
c3c13a2474 Fixed typo "tabs" ==> "button" 2012-02-01 22:20:24 -06:00
Mark Otto
f34ddb5c3f nuke all curly ticks 2012-02-01 18:27:38 -08:00
Mark Otto
160a0bf560 update tests for popover to use proper classes 2012-01-30 01:30:18 -08:00
Mark Otto
f4e5bc1c53 namespace popover values 2012-01-30 01:20:51 -08:00
Mark Reeder
f9b53d424e Fixes issue with Opera flickering on the collapse plugin when reset is called without specifying the size 
https://github.com/twitter/bootstrap/issues/1208
 2012-01-29 21:14:07 -08:00
Mark Otto
0952f3796e fix js readme api capitalization 2012-01-29 13:07:31 -08:00
Jacob Thornton
6935f693b3 typahead does case insensitive matching with simple sorter + accepts highlighter option 2012-01-28 13:16:05 -08:00
Jacob Thornton
12d3c2fe74 fix z-index issue with modals for popovers,tooltips,and dropdowns 2012-01-28 12:08:41 -08:00
Jacob Thornton
c2c02d104c Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 11:04:05 -08:00
Jacob Thornton
d465952138 clean up js api for dropdowns 2012-01-28 11:03:39 -08:00
Jon Stevens
8ade6989c3 no debugger 2012-01-28 02:25:13 -08:00
Jacob Thornton
e61164e67a all unit tests passing in ie7 2012-01-28 01:35:13 -08:00
Jacob Thornton
3451dcbc28 fix failing typeahead tests 2012-01-28 00:03:26 -08:00
Jacob Thornton
7cbb586825 move the matcher and sorter into the options - encourage people to override them... 2012-01-27 22:27:06 -08:00
Jacob Thornton
0255f47eb3 add zindex option for tooltips/popovers and fix modal zindex doc example 2012-01-27 21:36:58 -08:00
Jacob Thornton
3b3dbd7229 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 11:07:17 -08:00
Jacob Thornton
aa594501bd change typeahead to data-source instead of data-data and add to docs 2012-01-26 23:16:02 -08:00
Jacob Thornton
11d7ef1515 Merge pull request #1272 from napoleond/2.0-wip 
Support tab and enter in typeahead
 2012-01-26 23:04:42 -08:00
Mark Otto
5a48b22b83 Merge pull request #1269 from phopkins/ie_typeahead 
[2.0-wip] Fix typehead plugin for IE7/8
 2012-01-26 17:04:35 -08:00
David N
b9589fcb80 Enable default browser key behaviour when typeahead isn't showing. 2012-01-26 17:23:09 -06:00
Mark Otto
5844aa550d consistent new lines at ends of files 2012-01-26 15:00:59 -08:00
Pete Hopkins
1f04481092 Switches from Array#filter to jQuery.grep for IE<=8 support 2012-01-26 17:07:06 -05:00
Jacob Thornton
319b65e64b prevent default 2012-01-25 11:49:00 -08:00
Jacob Thornton
5e5e87fbd0 scrollspy working for sub navs 2012-01-24 22:33:33 -08:00
Jon Stevens
84a8aa1bea 2.0-wip: fix js heads 2012-01-24 11:08:03 -08:00
Eden
ec68b84123 i don't think the batch s/2011/2012/ was supposed to hit this. :) 2012-01-24 08:27:19 -08:00
Nicklas Ansman Giertz
4882e6da2f Rename the tooltip test file 
It had not been renamed when twipsys became tooltips.
 2012-01-22 12:33:30 +01:00
Nicklas Ansman Giertz
05fdd43e41 Add testcase to popover 
This test case verifies that custom classes are respected.
 2012-01-22 12:32:37 +01:00
Nicklas Ansman Giertz
6a9f169fd6 Make the popove respect custom classes 2012-01-22 12:06:59 +01:00