27 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	33e14fe5bf	Merge branch '2.2.2-wip' into 3.0.0-wip ... Conflicts: README.md docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/examples/fluid.html docs/scaffolding.html less/breadcrumbs.less less/popovers.less less/responsive.less	2012-12-05 11:05:10 -08:00
Mark Otto	32d425967a	run make on js changes to popover	2012-12-02 01:32:23 -08: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
Mark Otto	08b8571cb8	version bump to get this started	2012-09-05 10:00:57 -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	45dddc59a1	add click option for tooltip, popover - make click default for popover	2012-08-18 19:54:30 -07:00
Jacob Thornton	dcf75697ec	some progress on affix plugin	2012-07-22 18:28:39 -07:00
Mark Otto	59153205b3	run make on js files	2012-06-20 23:46:29 -07:00
Jacob Thornton	f836473129	add html option back to tooltip and popover to explicitly prevent XSS #3421	2012-06-02 17:55:10 -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	83febb3452	remake and add isHTML check to popover as well	2012-04-04 15:02:30 -07:00
Jacob Thornton	f02d017ffa	return matcher value directly + cleanup first lines of files	2012-03-24 18:59:04 -07:00
Jacob Thornton	d5fb653914	top stripping leading and trailing whitespace + always use .html method	2012-03-21 21:35:02 -07:00
Jacob Thornton	59503e71ff	2.0.2 derp	2012-03-12 14:09:38 -07: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	390a9af936	move js stuff into assets	2012-01-31 13:58:28 -08:00
Jacob Thornton	5f4e30ed1d	move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like	2011-09-09 22:47:49 -07:00
Jacob Thornton	fb8987148a	move javascript from examples into docs	2011-09-06 23:20:56 -07:00