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

..

tests

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j4

2013-02-20 02:16:44 +01:00

.jshintrc

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

bootstrap-affix.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-alert.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-button.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-carousel.js

clear interval in cycle + rebuild

2013-02-05 20:34:39 -08:00

bootstrap-collapse.js

don't hide if already hidden ya n00b

2013-02-05 21:08:56 -08:00

bootstrap-dropdown.js

Removed touchstart from bootstrap-dropdown.js.

2013-01-07 20:13:28 -05:00

bootstrap-fileupload.js

Merge branch 'patch-1' of github.com:ameyab/bootstrap into 2.2.2-j4-wip

2013-01-27 22:32:06 -08:00

bootstrap-inputmask.js

Small fixes inputmask

2013-01-27 22:59:50 -08:00

bootstrap-modal.js

only fire hidden once backdrop has been removed

2013-02-07 20:13:40 -08:00

bootstrap-popover.js

Merge pull request #6783 from joprice/popoverOptionsOverride

2013-02-05 21:48:34 -08:00

bootstrap-rowlink.js

Fix problem with tr comparison in jasny rowlink. Fixed #34

2012-12-25 05:43:40 +01:00

bootstrap-scrollspy.js

Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

2012-12-26 09:21:34 -06:00

bootstrap-tab.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-tooltip.js

dont remove title attribute part 2

2013-02-06 06:17:48 -05:00

bootstrap-transition.js

Version bump

2012-12-22 16:10:06 -08:00

bootstrap-typeahead.js

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j4

2013-02-20 02:16:44 +01:00

bootstrap.js

Added bootstrap.js in source

2012-11-16 10:34:55 +01:00