Mark Otto
|
a70c50d1f7
|
Merge branch 'master' 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/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/index.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/responsive.less
package.json
|
2013-03-01 12:37:21 -08:00 |
|
fat
|
3469339068
|
2.3.1
|
2013-02-28 20:55:14 -08:00 |
|
fat
|
ef80765726
|
pass true to cycle
|
2013-02-28 19:47:01 -08:00 |
|
Mark Otto
|
421f9f67c4
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less
|
2013-02-05 22:42:54 -08:00 |
|
fat
|
a866a51a2e
|
clear interval in cycle + rebuild
|
2013-02-05 20:34:39 -08:00 |
|
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
|
24a36df9f6
|
add support for [data-slide-to] attr on carousel
|
2012-12-21 19:45:19 -08:00 |
|
fat
|
82a758344d
|
add direction prop to carousel slide event
|
2012-12-21 17:31:54 -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 |
|
fat
|
5abe33f5d8
|
reset carousel in the case that it is reinstantiated twice
|
2012-12-20 01:13:03 -08:00 |
|
Mark Otto
|
72f13e2870
|
Merge branch '2.2.3' 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/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.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/responsive.less
less/type.less
package.json
|
2012-12-20 00:02:52 -08:00 |
|
fat
|
7f9ff0ba5b
|
add js support for carousel indicators
|
2012-12-19 23:25:25 -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
|
91fbadad5b
|
remove slide from carousel constructor #5579
|
2012-12-07 17:49:05 -05: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 |
|
fat
|
404e4d9e9a
|
fix carousel and rebuild js
|
2012-10-30 21:32:15 -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 |
|
Jacob Thornton
|
edc3eee5ea
|
fix carousel event
|
2012-10-17 22:26:44 -07:00 |
|
dmitriybudnik
|
432eaff29c
|
Fixed copy/paste caused typo
|
2012-10-15 22:35:32 +03:00 |
|
Carl Porth
|
e1f6458e36
|
don't wait for ready when binding events to document
|
2012-09-27 15:00:02 -07:00 |
|
Carl Porth
|
474471b831
|
bind data-api events to document instead of body to allow body replacement
|
2012-09-26 23:11:03 -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 |
|
Barryvdh
|
c028e33358
|
Scope finding the .active to .item
|
2012-06-08 16:19:08 +03:00 |
|
Jacob Thornton
|
31e8a358c3
|
check length so that pause, actually pauses
|
2012-06-03 11:24:19 -07:00 |
|
Jacob Thornton
|
2d3a0babd2
|
make active selector more specific #2043 and rebuild
|
2012-06-02 22:10:35 -07:00 |
|
Jacob Thornton
|
ebc1fe907d
|
only trigger $.support.transition.end when it exists
|
2012-06-02 21:09:13 -07:00 |
|
Jacob Thornton
|
3a751a63d4
|
fix multi carousel bug #3194
|
2012-06-02 21:01:45 -07:00 |
|
Jacob Thornton
|
555a3b0478
|
fix carousel when hiding a reshowing - make sure it always triggers transition end #3248
|
2012-06-02 20:28:08 -07:00 |
|
Jacob Thornton
|
806a82ef83
|
add relatedTarget to carousel slide event
|
2012-06-02 18:06:00 -07:00 |
|
Jacob Thornton
|
ebc6935663
|
2.0.3 -> 2.0.4
|
2012-06-01 11:04:27 -07:00 |
|
Jacob Thornton
|
839ef3a030
|
2.0.2 -> 2.0.3
|
2012-04-24 02:19:02 -07:00 |
|
Jacob Thornton
|
82267d48ff
|
calling pause on a slide should actually pause it - even when hovering
|
2012-04-14 17:49:51 -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
|
63bd7cb478
|
fix slide logic for ie+ in carousel
|
2012-03-19 21:39:39 -07:00 |
|
Jacob Thornton
|
67f199678c
|
if interval is false, do not autocycle the carousel
|
2012-03-19 15:48:57 -07:00 |
|
Jacob Thornton
|
59503e71ff
|
2.0.2 derp
|
2012-03-12 14:09:38 -07:00 |
|
Jacob Thornton
|
fb74018ae2
|
and pause on hover option to carousel
|
2012-02-24 21:51:39 -08:00 |
|
Jacob Thornton
|
f046c12bd2
|
fix cycling in carousel
|
2012-02-20 22:01:38 -08:00 |
|
Jacob Thornton
|
7ec09d0db9
|
2.0.1
|
2012-02-16 22:42:38 -08:00 |
|