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
|
839b0c893f
|
shiiiit
|
2013-02-28 21:15:33 -08:00 |
|
fat
|
3469339068
|
2.3.1
|
2013-02-28 20:55:14 -08:00 |
|
Mark Otto
|
2aa1a4dc70
|
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
|
2013-02-07 22:18:53 -08:00 |
|
fat
|
366e1e0a6d
|
only fire hidden once backdrop has been removed
|
2013-02-07 20:13:40 -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
|
a9729c5fd0
|
fix js from @fat feedback for modal
|
2013-02-07 19:38:46 -08:00 |
|
Mark Otto
|
8ca70bd83a
|
Overhaul modal to make it responsive and not super lame
|
2013-02-06 02:07:40 -08:00 |
|
Mark Otto
|
f74990d898
|
Version bump
|
2012-12-22 16:10:06 -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
|
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
|
45046544a6
|
when static, refocus on click
|
2012-10-17 23:36:22 -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 |
|
mfansler
|
e24b46b7f3
|
fixes #5336: reorder focus() call to avoid scrolling
|
2012-10-16 12:27:43 -04: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 |
|
Jacob Thornton
|
88b1e44dd6
|
change tooltip/popover insert strategy
remove modal-open class
hopefully resolve z-index headaches
|
2012-09-24 23:28:38 -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 |
|
Dirk Ginader
|
6977d35eed
|
close #3531 added focus handling and removed the badly announced "times" close button from screenreaders
|
2012-08-01 20:11:16 -07:00 |
|
Jacob Thornton
|
dcf75697ec
|
some progress on affix plugin
|
2012-07-22 18:28:39 -07:00 |
|
Jacob Thornton
|
82ea5847a7
|
adds remote source to modal. Remote source can be specified in href or by providing a remote option #936
|
2012-06-03 21:26:54 -07:00 |
|
Jacob Thornton
|
5e5965ca6f
|
Merge branch 'accessibility' into 2.1.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
|
2012-06-02 16:11:35 -07:00 |
|
Jacob Thornton
|
ebc6935663
|
2.0.3 -> 2.0.4
|
2012-06-01 11:04:27 -07:00 |
|
Jacob Thornton
|
10c6db4b14
|
add proper role to dialog markup and cleanup modal logging
|
2012-05-16 19:43:22 -07:00 |
|
Jacob Thornton
|
a404ac33bb
|
modal accessibility tab control
|
2012-05-16 19:09:57 -07:00 |
|
Jacob Thornton
|
839ef3a030
|
2.0.2 -> 2.0.3
|
2012-04-24 02:19:02 -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
|
ef5ac02b69
|
allow prevent default for show and hide event in modal
|
2012-03-24 17:50:21 -07:00 |
|
Jacob Thornton
|
59503e71ff
|
2.0.2 derp
|
2012-03-12 14:09:38 -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
|
5b4a29d84e
|
honor data attributes set on modal as well
|
2012-02-12 11:15:12 -08:00 |
|
Jacob Thornton
|
c8c4d5b392
|
fix alert tests + add show option back to modals
|
2012-02-06 00:17:31 -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
|
e61164e67a
|
all unit tests passing in ie7
|
2012-01-28 01:35:13 -08:00 |
|
Mark Otto
|
5844aa550d
|
consistent new lines at ends of files
|
2012-01-26 15:00:59 -08:00 |
|
Jon Stevens
|
84a8aa1bea
|
2.0-wip: fix js heads
|
2012-01-24 11:08:03 -08:00 |
|
Mark Otto
|
16eccc43d9
|
dates updated to 2012
|
2012-01-14 23:28:48 -08:00 |
|
Jacob Thornton
|
aa0c4acd80
|
fix modal insertion boolean
|
2012-01-08 14:38:21 -08:00 |
|
Jacob Thornton
|
76cadd1d2a
|
only append modal to dom if not already present
|
2012-01-08 14:36:41 -08:00 |
|