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
501aabf572
remove prevent default on focus
2013-02-07 21:42:34 -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
f74990d898
Version bump
2012-12-22 16:10:06 -08:00
fat
5da30ee5fb
Merge branch 'marcelkorpel-master' into 2.3.0-wip
2012-12-21 17:24:45 -08:00
fat
d5345f806c
Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master
2012-12-21 17:19:36 -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
dc4e80a655
fix ghetto ass timeout shit
2012-12-19 21:55:23 -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
820a3b27b6
get tests passing for typeahead :P
2012-12-07 19:16:48 -05:00
fat
1747caf19d
insert menu of typeahead after input which it suggests on #3529
...
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
2012-12-07 18:59:13 -05:00
billy gates
c362e72660
Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-nav
...
Fix issue with double move event firing in typeahead.
2012-12-07 14:16:51 -08:00
fat
a7eb9c294a
add noConflict functionality to all bootstrap plugins
2012-12-07 17:06:01 -05:00
Marcel Korpel
0dece7a71f
Set focus back to input field after clicking an item
...
Test 'focus is still set' added
Fixes issue #5933
2012-12-02 12:35:33 +01:00
Mark Otto
98b0d475ae
version bump to 3.0
2012-11-30 22:30:50 -08:00
Paul McLanahan
6ec7c72e5b
Fix issue with double move event firing in typeahead.
...
Fix test to catch issue.
Fix #5806 .
2012-11-13 11:00:34 -05: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
ba2a99e7c4
don't lookup typeahead when shift alt or ctrl are pushed
2012-10-17 23:39:41 -07: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
667179f406
added support for jquery 1.8.*
2012-09-20 16:23:54 -07:00
Mark Otto
08b8571cb8
version bump to get this started
2012-09-05 10:00:57 -07:00
Ross Johnson
b5373d8561
Merge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip
2012-08-28 11:14:34 -05:00
Ross Johnson
66ad3d62c6
Fix key events with Chrome + jQuery 1.8.0
2012-08-28 00:55:56 -05: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
Jacob Thornton
2b2b3303e1
fix indexof on array for ie8
2012-08-02 16:58:25 -07:00
Jacob Thornton
fae6c36874
adds minLength #3960
2012-07-22 14:50:52 -07:00
Matt Morgan
af14f6db5d
Merge branch 'async' into 2.1.0-wip
2012-06-03 00:33:06 -04:00
Jacob Thornton
0b827965d3
fix regression in typeahead #3313
2012-06-02 19:31:30 -07:00
Jacob Thornton
ebc6935663
2.0.3 -> 2.0.4
2012-06-01 11:04:27 -07:00
Matt Morgan
bf9d8fcc07
Alter typeahead to accept synchronous/asynchronous data source via function/callback
2012-04-26 14:09:20 -04:00
Jacob Thornton
fc509e14b2
revert position -> offset for typeahead position
2012-04-25 22:14:39 -07:00
Jacob Thornton
839ef3a030
2.0.2 -> 2.0.3
2012-04-24 02:19:02 -07:00
Jacob Thornton
8f98c4fbf6
offset -> position #3088
2012-04-18 13:15:13 -07:00
Nirav Sanghani
8e8b1ad03d
Allow updater function (updates the value of the input field) to be overridden.
2012-04-16 17:05:35 -07:00
Jacob Thornton
575f18aaf4
add jshint support + a few minor stylistic changes
2012-04-14 16:29:53 -07:00
Jacob Thornton
08fee005a8
https://github.com/twitter/bootstrap/issues/2954
2012-04-07 21:26:46 -07:00
Jacob Thornton
f02d017ffa
return matcher value directly + cleanup first lines of files
2012-03-24 18:59:04 -07:00
Jacob Thornton
663e41d74f
prevent dropdowns from closing when clicking inside form element inside dropdown
2012-03-19 23:13:55 -07:00
Jacob Thornton
83a7a69893
typeahead should escape regexp special chars
2012-03-19 15:33:28 -07:00
Jacob Thornton
59503e71ff
2.0.2 derp
2012-03-12 14:09:38 -07: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
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
