Mark Otto
|
7d8d5c7838
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
|
2013-01-13 04:26:52 -08:00 |
|
Mark Otto
|
9749d6afc2
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
|
2012-12-26 09:21:34 -06:00 |
|
Mark Otto
|
f74990d898
|
Version bump
|
2012-12-22 16:10:06 -08:00 |
|
fat
|
4d195222d4
|
remake js
|
2012-12-22 13:48:28 -08:00 |
|
Mark Otto
|
a5e04c0799
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
|
2012-12-20 13:47:36 -08:00 |
|
Mark Otto
|
b6575cc72e
|
fix up code snippet
|
2012-12-20 13:41:08 -08:00 |
|
Mark Otto
|
529ecc5a77
|
Version bump
|
2012-12-10 18:31:04 -08:00 |
|
Mark Otto
|
bc0b94a3fd
|
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
|
2012-12-08 17:40:42 -08:00 |
|
fat
|
a7eb9c294a
|
add noConflict functionality to all bootstrap plugins
|
2012-12-07 17:06:01 -05:00 |
|
Mark Otto
|
98b0d475ae
|
version bump to 3.0
|
2012-11-30 22:30:50 -08:00 |
|
Mark Otto
|
79b7017227
|
version bump
|
2012-11-05 09:32:48 -08:00 |
|
fat
|
3b3dd3ac3c
|
2.2.1 - hotfix for carousel
|
2012-10-30 21:59:56 -07:00 |
|
Mark Otto
|
41ad16fe40
|
v2.2.0 instead of v2.1.2
|
2012-10-29 21:00:53 -07:00 |
|
Jacob Thornton
|
7f3b94c453
|
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
Conflicts:
js/bootstrap-carousel.js
|
2012-10-17 23:05:16 -07:00 |
|
Mark Otto
|
08b8571cb8
|
version bump to get this started
|
2012-09-05 10:00:57 -07:00 |
|
Mark Otto
|
1c134d9a7f
|
update version numbers to 2.1.1
|
2012-08-21 13:11:25 -07:00 |
|
Mark Otto
|
e510306196
|
bump versions to 2.1.0
|
2012-08-19 23:07:18 -07:00 |
|
Mark Otto
|
9a3a297a47
|
update version # on homepage, crush assets
|
2012-06-02 22:12:45 -07:00 |
|
Jacob Thornton
|
fc96bc8bba
|
rebuild doi
|
2012-06-02 17:30:00 -07:00 |
|
Jacob Thornton
|
5b401a8c16
|
add collapsed class to collapse invoker when it's target is collapsed #3525
|
2012-06-02 17:28:38 -07:00 |
|
Jacob Thornton
|
ebc6935663
|
2.0.3 -> 2.0.4
|
2012-06-01 11:04:27 -07:00 |
|
Jacob Thornton
|
aaabe2a46c
|
fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)
|
2012-04-24 18:06:41 -07:00 |
|
Jacob Thornton
|
839ef3a030
|
2.0.2 -> 2.0.3
|
2012-04-24 02:19:02 -07:00 |
|
Jacob Thornton
|
0b8042656f
|
fixes #2941 + whitespace in collapse
|
2012-04-15 16:15:32 -07:00 |
|
Jacob Thornton
|
575f18aaf4
|
add jshint support + a few minor stylistic changes
|
2012-04-14 16:29:53 -07:00 |
|
Jacob Thornton
|
f02d017ffa
|
return matcher value directly + cleanup first lines of files
|
2012-03-24 18:59:04 -07:00 |
|
Jacob Thornton
|
bccc2cb719
|
add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last
|
2012-03-24 18:20:09 -07:00 |
|
Jacob Thornton
|
cb8dcfcebf
|
if transitioning collapse, don't start new transition
|
2012-03-20 22:43:27 -07:00 |
|
Jacob Thornton
|
bce33bbb09
|
if parent in collapse, only grab children
|
2012-03-19 21:10:55 -07:00 |
|
Jacob Thornton
|
630ff4ff7d
|
fix collapse bug in ie7+ for initial collapse in
|
2012-03-19 20:51:20 -07:00 |
|
Jacob Thornton
|
59503e71ff
|
2.0.2 derp
|
2012-03-12 14:09:38 -07:00 |
|
Jacob Thornton
|
56fe54df43
|
remove collapse class on open so that dropdowns are viewable
|
2012-03-12 13:37:44 -07:00 |
|
Jacob Thornton
|
7ec09d0db9
|
2.0.1
|
2012-02-16 22:42:38 -08:00 |
|
Jacob Thornton
|
6e77c9d123
|
add semicolons to the end of js files
|
2012-02-13 18:41:02 -08:00 |
|
Jacob Thornton
|
390a9af936
|
move js stuff into assets
|
2012-01-31 13:58:28 -08:00 |
|