Commit Graph

2435 Commits

Author SHA1 Message Date
Arnold Daniels
1cff533264 Added mailinglist subscribe to docs
Updated docs: "File upload image preview works fine on recent Safari". Fixes #97
2013-06-09 17:43:52 +02:00
Arnold Daniels
2c8951d30f Fixed catincan badge 2013-05-04 01:08:12 +02:00
Arnold Daniels
6e6f9f4cd4 Merge pull request #105 from GarthSnyder/2.3.1-j7-wip
Minor edits to File Upload docs: rm dup sentences, fix formats, clarify
2013-05-03 22:35:54 +02:00
Arnold Daniels
996c2c3f1b Added Catincan banner 2013-05-03 22:33:14 +02:00
Arnold Daniels
b3222eeac6 Fixed bootstrap.css 2013-03-11 02:07:30 +01:00
Arnold Daniels
48c7638a42 Merge branch '2.3.1-j6-wip'
Conflicts:
	README.md
	component.json
	docs/index.html
	package.json
2013-03-11 02:01:14 +01:00
Arnold Daniels
7337f2961a Version 2.3.1-j6
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j5-wip

Conflicts:
	Makefile
	README.md
	component.json
	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-typeahead.js
	package.json
2013-03-11 01:54:03 +01:00
Arnold Daniels
6c1cbe41f4 Build new zip 2013-03-04 16:27:27 +01:00
Arnold Daniels
4dbaeae376 Bump to j5 2013-03-04 02:22:38 +01:00
Arnold Daniels
0ba9bda24a data-provide instead of data-provides for rowlink. Fixes #44
Fixed CSS compile order. Fixes #82 Fixes #83
2013-03-03 18:18:27 +01: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
fat
cec434a4c3 rebuild 2013-02-28 20:48:48 -08:00
fat
2f27d9851c whitespace 2013-02-28 20:48:02 -08:00
fat
01e0f8c653 only pass unique options through to child nodes in tooltips 2013-02-28 20:39:07 -08:00
fat
cf998040ec rebuild 2013-02-28 19:49:08 -08:00
fat
40b7a909a6 le sigh 2013-02-28 19:37:30 -08:00
Arnold Daniels
aa559571bb Fix missing accordion CSS when customizing. Fixes #71.
Fix typeahead docs, function options. Fixes #73
2013-02-20 02:30:57 +01:00
Arnold Daniels
695c18090a Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j4
Fixed variables when loading custom.json

Conflicts:
	Makefile
	README.md
	component.json
	composer.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/application.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/javascript.html
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-typeahead.js
	package.json
2013-02-20 02:16:44 +01:00
fat
501aabf572 remove prevent default on focus 2013-02-07 21:42:34 -08:00
fat
366e1e0a6d only fire hidden once backdrop has been removed 2013-02-07 20:13:40 -08:00
fat
1bf070b4ce Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-07 19:47:01 -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
e3f3542d0b Fixes #6823: add some docs notes about tooltips in input groups 2013-02-06 17:25:58 -08:00
Mark Otto
2fa77bf197 Update link to changelog 2013-02-05 22:46:45 -08:00
fat
3b56227553 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat
4814281540 clean up styles 2013-02-05 22:29:59 -08:00
Mark Otto
accfdaafdb Fixes #6808: mention IE lame-itude in docs for invalid inputs 2013-02-05 22:28:18 -08:00
Mark Otto
0fe9148b91 Fixes #6190: Add print utility classes 2013-02-05 22:17:28 -08:00
Mark Otto
1629df8008 screwed up a merge and an old version number crept in 2013-02-05 21:20:29 -08:00
fat
a4b31d39a2 don't hide if already hidden ya n00b 2013-02-05 21:08:56 -08:00
fat
a866a51a2e clear interval in cycle + rebuild 2013-02-05 20:34:39 -08:00
fat
c25e8182ba Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 20:01:25 -08:00
fat
45656fc7fc update jquery to 1.9 2013-02-05 20:00:50 -08:00
Mark Otto
c97d304c0c derp, fix broke css and recompile 2013-02-05 19:43:49 -08:00
Mark Otto
15c7e73abd Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
2013-02-05 19:39:49 -08:00
Mark Otto
db8a78fae6 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:04 -08:00
Mark Otto
dbe8aed76e Merge pull request #6763 from rjregenold/2.3.0-wip
fixes jankiness with anchor tags in carousel.
2013-02-02 12:35:39 -08:00
Nikhil Dabas
b7b2e4f8a1 Fixing inline lists for IE7 2013-02-02 02:04:30 +05:30
Mark Otto
7d655c3549 Use button element instead of a for responsive navbar buttons 2013-02-01 10:33:36 -08:00
RJ Regenold
2f44d8d2da removes anchor tag definition. 2013-01-31 12:49:53 -06:00
RJ Regenold
6014e63054 lets see how much i can mess this pull request up. :| 2013-01-31 11:10:41 -06:00
RJ Regenold
e38d08d4c0 fixes jankiness with anchor tags in carousel. 2013-01-31 10:03:53 -06:00
Mark Otto
baadc33c88 make on prev commit 2013-01-30 18:22:20 -08:00
Mark Otto
3cc65cb86c clear up show-grid stuff 2013-01-30 18:16:14 -08:00
Mark Otto
dd4ce35ddc add meta tag to second example 2013-01-30 17:46:18 -08:00
Mark Otto
a5fc3e0667 make on prev commit 2013-01-30 17:45:02 -08:00
Mark Otto
3b6b8e9f41 Merge branch 'greg-raven-patch-2' into 2.3.0-wip 2013-01-30 17:44:45 -08:00
Mark Otto
f20c3368e4 Update pagination example HTML to match examples 2013-01-30 17:42:03 -08:00
Fred Sauer
d6e3b6b5a4 Fix form-actions documentation 2013-01-28 10:01:59 -08:00