Commit Graph

3677 Commits

Author SHA1 Message Date
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
5192619cdd Added donate link to readme 2013-04-09 20:45:35 +03: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
2f3c08f2c5 Merge pull request #91 from vinc3m1/2.3.0-j5-wip
match case insensitive file extensions for photos
2013-03-10 17:41:58 -07:00
Vince Mi
5db41d5af0 match case insensitive file extensions for photos 2013-03-10 10:05:48 -07:00
Arnold Daniels
6c1cbe41f4 Build new zip 2013-03-04 16:27:27 +01:00
Arnold Daniels
4d18b8c031 Merge branch 'master' of github.com:jasny/bootstrap 2013-03-04 16:23:19 +01:00
Arnold Daniels
49b31c671d Build new zip 2013-03-04 16:22:32 +01:00
Arnold Daniels
0879bd3aff Correct version number in README.md 2013-03-04 13:33:34 +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-kun
eb24718add Merge pull request #7111 from twitter/2.3.1-wip
2.3.1 wip
2013-02-28 21:24:27 -08:00
fat
6b2a010357 update changelog 2013-02-28 21:16:08 -08:00
fat
839b0c893f shiiiit 2013-02-28 21:15:33 -08:00
fat
0992a85932 woops that should stay 2.3.0 2013-02-28 21:00:21 -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
a61322c2fb WHOOPS ( >_>) 2013-02-28 20:46:51 -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
ef80765726 pass true to cycle 2013-02-28 19:47:01 -08:00
fat
40b7a909a6 le sigh 2013-02-28 19:37:30 -08:00
Mark Otto
16111a5e45 Merge pull request #6967 from twitter/readme_npm_fix
Update readme npm instructions
2013-02-21 13:10:21 -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
Mark Otto
e6a6fd2585 Backport v3's readme update on npm install to 2.3 2013-02-17 15:36:24 -08:00
fat
8c7f9c66a7 Merge branch '2.3.0-wip' 2013-02-07 22:13:13 -08:00
Mark Otto
c4d47fb1ea Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-07 22:08:13 -08:00
Mark Otto
30fd4be093 add 2.3 changelog section 2013-02-07 22:08:04 -08: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
c8874ff285 Merge pull request #6813 from Yohn/patch-12
don't remove title attribute for tooltips for 2.3-wip
2013-02-06 13:19:50 -08:00
Yohn
60c9ff4364 unit tests 2013-02-06 06:20:05 -05:00
Yohn
beb60309d1 dont remove title attribute part 2 2013-02-06 06:17:48 -05: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
fat
5e4db94c24 Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip 2013-02-05 22:10:41 -08:00
fat-kun
6a9cd513c0 Merge pull request #6783 from joprice/popoverOptionsOverride
reordered access of options in tooltip and popover
2013-02-05 21:48:34 -08:00
fat-kun
042bb9b515 Merge pull request #6780 from agatronic/2.3.0-wip
less: Move to new selector interpolation, supported from 1.3.1
2013-02-05 21:29:59 -08:00