0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

29 Commits

Author SHA1 Message Date
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
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
Mark Otto
08b8571cb8 version bump to get this started 2012-09-05 10:00:57 -07:00
Jacob Thornton
601e252074 fix for #4761 2012-08-27 20:58:51 -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
Jacob Thornton
ebc6935663 2.0.3 -> 2.0.4 2012-06-01 11:04:27 -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
59503e71ff 2.0.2 derp 2012-03-12 14:09:38 -07:00
Jacob Thornton
3d58b46226 fix bootstrap-button toggle regression + tests 2012-02-18 23:29:58 -08: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
139a077543 don't use e.target incase button has icon or other content inside it 2012-02-07 21:55:27 -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
f1cbd22b99 fix buttons for firefox 2012-01-08 11:23:51 -08:00
Jacob Thornton
f72a94ae28 update more readme changes - introduce target specificty convention to more plugins 2011-12-20 23:28:48 -08:00
Jacob Thornton
1ef5fa7d6b giant refactor - all spec passing again... 2011-12-20 18:02:47 -08:00
Jacob Thornton
cee2f61898 define constructor on prototypes 2011-11-30 22:42:22 -08:00
Jacob Thornton
7eb340ec58 add code to reset data for collapsed element so that item can be intitialized with correct options 2011-11-27 17:31:12 -08:00