2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

3577 Commits

Author SHA1 Message Date
Mark Otto d991ef2ab1 Merge pull request #8242 from cvrebert/patch-1
Apply #8166 to master so folks can build a non-empty v2.3.2
2013-06-20 12:11:39 -07:00
Chris Rebert 514ea6ea76 Bump Recess to v1.1.8 to fix further less.js version problems
Apparently Recess v1.1.7 had another problem:
https://github.com/twitter/recess/pull/100
2013-06-20 12:14:46 -06:00
Chris Rebert beca8a6b74 Apply #8166 to master so folks can build v2.3.2 2013-06-20 12:04:20 -06:00
Mark Otto de683e9003 Update README.md 2013-06-13 22:57:05 -07:00
Mark Otto 60b202de32 Fix link to Bower in readme 2013-06-06 09:14:52 -07:00
fat d9b502dfb8 missed a few 2.3.1's 2013-05-17 10:26:09 -07:00
fat c9789f7515 update versioning to 2.3.2 2013-05-17 10:20:13 -07:00
fat b9bd82b496 patch dropdowns for #7118 2013-05-17 10:13:22 -07:00
Mark Otto 37d0a30589 Merge pull request #7287 from waynn/patch-1
fix pluralization since "a" is in front for issue #6342
2013-03-14 22:21:06 -07:00
Waynn Lue 1c7fe5d887 fix pluralization since "a" is in front 2013-03-06 22:01:21 -08:00
fat-kun eb24718add Merge pull request #7111 from twitter/2.3.1-wip
2.3.1 wip
v2.3.1
2013-02-28 21:24:27 -08:00
fat 6b2a010357 update changelog 2013-02-28 21:16:08 -08:00
fat 839b0c893f shiiiit 2013-02-28 21:15:33 -08:00
fat 0992a85932 woops that should stay 2.3.0 2013-02-28 21:00:21 -08:00
fat 3469339068 2.3.1 2013-02-28 20:55:14 -08:00
fat cec434a4c3 rebuild 2013-02-28 20:48:48 -08:00
fat 2f27d9851c whitespace 2013-02-28 20:48:02 -08:00
fat a61322c2fb WHOOPS ( >_>) 2013-02-28 20:46:51 -08:00
fat 01e0f8c653 only pass unique options through to child nodes in tooltips 2013-02-28 20:39:07 -08:00
fat cf998040ec rebuild 2013-02-28 19:49:08 -08:00
fat ef80765726 pass true to cycle 2013-02-28 19:47:01 -08:00
fat 40b7a909a6 le sigh 2013-02-28 19:37:30 -08:00
Mark Otto 16111a5e45 Merge pull request #6967 from twitter/readme_npm_fix
Update readme npm instructions
2013-02-21 13:10:21 -08:00
Mark Otto e6a6fd2585 Backport v3's readme update on npm install to 2.3 2013-02-17 15:36:24 -08:00
fat 8c7f9c66a7 Merge branch '2.3.0-wip' v2.3.0 2013-02-07 22:13:13 -08:00
Mark Otto c4d47fb1ea Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-07 22:08:13 -08:00
Mark Otto 30fd4be093 add 2.3 changelog section 2013-02-07 22:08:04 -08:00
fat 501aabf572 remove prevent default on focus 2013-02-07 21:42:34 -08:00
fat 366e1e0a6d only fire hidden once backdrop has been removed 2013-02-07 20:13:40 -08:00
fat 1bf070b4ce Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-07 19:47:01 -08:00
fat d8a7a380bc if no callback, don't try to call callback ya goof 2013-02-07 19:45:42 -08:00
Mark Otto e3f3542d0b Fixes #6823: add some docs notes about tooltips in input groups 2013-02-06 17:25:58 -08:00
Mark Otto c8874ff285 Merge pull request #6813 from Yohn/patch-12
don't remove title attribute for tooltips for 2.3-wip
2013-02-06 13:19:50 -08:00
Yohn 60c9ff4364 unit tests 2013-02-06 06:20:05 -05:00
Yohn beb60309d1 dont remove title attribute part 2 2013-02-06 06:17:48 -05:00
Mark Otto 2fa77bf197 Update link to changelog 2013-02-05 22:46:45 -08:00
fat 3b56227553 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat 4814281540 clean up styles 2013-02-05 22:29:59 -08:00
Mark Otto accfdaafdb Fixes #6808: mention IE lame-itude in docs for invalid inputs 2013-02-05 22:28:18 -08:00
Mark Otto 0fe9148b91 Fixes #6190: Add print utility classes 2013-02-05 22:17:28 -08:00
fat 5e4db94c24 Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip 2013-02-05 22:10:41 -08:00
fat-kun 6a9cd513c0 Merge pull request #6783 from joprice/popoverOptionsOverride
reordered access of options in tooltip and popover
2013-02-05 21:48:34 -08:00
fat-kun 042bb9b515 Merge pull request #6780 from agatronic/2.3.0-wip
less: Move to new selector interpolation, supported from 1.3.1
2013-02-05 21:29:59 -08:00
Mark Otto 1629df8008 screwed up a merge and an old version number crept in 2013-02-05 21:20:29 -08:00
fat a4b31d39a2 don't hide if already hidden ya n00b 2013-02-05 21:08:56 -08:00
fat a866a51a2e clear interval in cycle + rebuild 2013-02-05 20:34:39 -08:00
fat-kun ee91afba63 Merge pull request #6481 from pseidemann/patch-1
don't remove title attribute for tooltips
2013-02-05 20:13:57 -08:00
fat-kun 566380b257 Merge pull request #6488 from nanek/dropdowns-remove-touchstart
Remove touchstart from bootstrap-dropdown.js.
2013-02-05 20:08:42 -08:00
fat c25e8182ba Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 20:01:25 -08:00
fat 45656fc7fc update jquery to 1.9 2013-02-05 20:00:50 -08:00