github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-01-23 21:27:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,433 Commits 13 Branches 16 Tags
v2.2.2-p3
Commit Graph

343 Commits

Author SHA1 Message Date
Arnold Daniels
fb77462b91 Small fixes inputmask 
Set default option 'mask'. Fix #54
Allow setting the definitions as option.
 2013-01-27 22:59:50 -08:00
Arnold Daniels
db7f905653 Fix jQuery 1.9 removed $.browser for inputmask. Fixes #63 2013-01-27 22:35:56 -08:00
Arnold Daniels
677bf21344 Merge branch 'patch-1' of github.com:ameyab/bootstrap into 2.2.2-j4-wip 2013-01-27 22:32:06 -08:00
Ameya Bhatawdekar
75f545982c Update js/bootstrap-fileupload.js 
Support for jquery.browser was removed in 1.9. This caused the "Remove" button to not work. 

Changed line 103 from 
   if($.browser.msie){
to 
   if (navigator.userAgent.match(/msie/i)){
 2013-01-27 17:22:01 -08:00
Arnold Daniels
ce0b235c86 Bind to document instead of 'body' 
As per twitter#5308
 2013-01-15 03:12:14 +01:00
Arnold Daniels
15c80617a5 Merge branch 'patch-1' of github.com:ghiculescu/bootstrap into 2.2.2-j4-wip 2013-01-15 03:08:34 +01:00
Arnold Daniels
f28b38852d Fileupload fix: Don't need to get file on clear 2013-01-15 03:01:03 +01:00
gboer
a78887117c Update js/bootstrap-fileupload.js 
A bit better fix for when the element itself is the dismiss button
 2013-01-12 12:03:53 +01:00
Alex Ghiculescu
695b1ccafe Bind to document instead of 'body' 
As per https://github.com/twitter/bootstrap/pull/5308
 2012-12-31 15:10:41 +10:00
Arnold Daniels
ef7599fd94 Fixed comments in bootstrap-fileupload.js 2012-12-26 10:44:48 +01:00
Arnold Daniels
c63e570f7f Using in fileupload. Fixed #19 2012-12-25 06:48:51 +01:00
Arnold Daniels
8fa7b7ee99 Reset fileupload on form reset. Fixed #31 
Allow resetting and clearing fileupload using js
 2012-12-25 06:41:17 +01:00
Arnold Daniels
0657ace43c Fix problem with tr comparison in jasny rowlink. Fixed #34 2012-12-25 05:43:40 +01:00
Arnold Daniels
50636c2345 Fix GET data for js test server 2012-12-25 05:22:28 +01:00
Arnold Daniels
c607fec9b9 Merge branch 'master' of git://github.com/SkynetInc/jasny-bootstrap into 2.2.2-j3-wip 2012-12-25 05:10:10 +01:00
Arnold Daniels
a78e874844 Fixed typeahead issues 
Added typeahead tests
Added new features of typeahead to docs
 2012-12-25 04:46:34 +01:00
Arnold Daniels
32a25811ff Add semicolon after (window.jQuery). fixes #39 2012-12-22 00:37:52 +01:00
Trindaz
393e5ae2de support ie8+ for changing target file 2012-12-20 18:03:37 +11:00
Arnold Daniels
f997a9ada7 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.2.2-j3 
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/docs.css
	docs/assets/img/bs-docs-bootstrap-features.png
	docs/assets/img/bs-docs-responsive-illustrations.png
	docs/assets/img/bs-docs-twitter-github.png
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
 2012-12-10 00:22:22 +01: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
fat
437654030a focus on escape in typeahead 2012-12-07 18:37:32 -05:00
fat
10e72e158d Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 17:50:34 -05:00
fat
91fbadad5b remove slide from carousel constructor #5579 2012-12-07 17:49:05 -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
66b70016d0 rebuild and only select visible dropdown items 2012-12-07 17:14:49 -05:00
billy gates
2526c3fdbe Merge pull request #6118 from godric7/master 
scrollSpy - add parent scrollTop to offset calculation
 2012-12-07 14:11:18 -08:00
fat
a7eb9c294a add noConflict functionality to all bootstrap plugins 2012-12-07 17:06:01 -05:00
Mark Otto
ed74992853 Fixes #4550: Temporary fix for dropdown taps on mobile 
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
 2012-12-04 18:36:18 -08:00
Godric
8b959cacbc Update js/bootstrap-scrollspy.js 
Fix for Bootstrap issue #6013 "scrollSpy - offset calculation"
https://github.com/twitter/bootstrap/issues/6013
 2012-12-04 01:21:07 +01:00
Mark Otto
85c57c6ba8 Merge branch 'Moveo-master' into 2.2.2-wip 2012-12-02 01:32:13 -08:00
Arnold Daniels
176ab8f778 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip 
Conflicts:
	Makefile
	README.md
	docs/assets/css/docs.css
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/build/index.js
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
 2012-11-29 23:58:46 +01:00
Swaagie
e6e4d93d5e leave it to the developer to decide how to use the content of the popover 2012-11-27 15:07:31 +01:00
Ingmar Steen (Voipro)
6b7027eaec Check if target is dismiss or trigged in fileupload data-api click handler. 2012-11-16 10:34:55 +01:00
Arnold Daniels
2c5abe3cbb Added bootstrap.js in source 2012-11-16 10:34:55 +01: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
fat
404e4d9e9a fix carousel and rebuild js 2012-10-30 21:32:15 -07:00
Mark Otto
b5af762ef5 Merge branch '2.1.2-wip' 
Conflicts:
	js/bootstrap-dropdown.js
 2012-10-29 22:01:58 -07:00
Mark Otto
41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07:00
Arnold Daniels
34648bb0bd Added typeahead functionality 
* AJAX search
 * Convert select to typeahead
 * Use value objects as search
 * Customizable dropdown
 * Min-width menu typeahead
 * Fixed click typeahead menu (see twitter/bootstrap#2715) as suggested by @mckramer

Padding 2px for select
 2012-10-28 02:46:52 +02:00
Jacob Thornton
ba2a99e7c4 don't lookup typeahead when shift alt or ctrl are pushed 2012-10-17 23:39:41 -07:00
Jacob Thornton
45046544a6 when static, refocus on click 2012-10-17 23:36:22 -07:00
Jacob Thornton
0b9d4e78ad Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 23:06:58 -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
billy gates
d6ac499ca8 Merge pull request #5309 from erlendfh/dropdown-bugfix 
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
 2012-10-17 23:00:41 -07:00
billy gates
24b5e6cb14 Merge pull request #5366 from Sinetheta/2.1.2-wip 
Fix for #5362
 2012-10-17 22:30:40 -07:00
Jacob Thornton
a2fc01444e Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 22:27:00 -07:00
Jacob Thornton
edc3eee5ea fix carousel event 2012-10-17 22:26:44 -07:00