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 |
|
Arnold Daniels
|
65f8a89ebe
|
Build 2.2.2-j4
|
2013-01-27 23:05:40 -08:00 |
|
Geoff Young
|
f3268db4b4
|
Update Recess version
|
2013-01-19 16:27:10 -05:00 |
|
Mark Otto
|
f74990d898
|
Version bump
|
2012-12-22 16:10:06 -08:00 |
|
Mark Otto
|
9726fded1c
|
Get on that carousel indicator lifestyle with some new hawtness
|
2012-12-19 23:52:38 -08:00 |
|
fat
|
5bd8cdca91
|
remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install
|
2012-12-19 21:36:50 -08:00 |
|
Mark Otto
|
529ecc5a77
|
Version bump
|
2012-12-10 18:31:04 -08:00 |
|
Arnold Daniels
|
f997a9ada7
|
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.2.2-j3
Conflicts:
Makefile
README.md
component.json
docs/assets/css/docs.css
docs/assets/img/bs-docs-bootstrap-features.png
docs/assets/img/bs-docs-responsive-illustrations.png
docs/assets/img/bs-docs-twitter-github.png
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/base-css.html
docs/components.html
docs/customize.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/customize.mustache
docs/templates/pages/index.mustache
js/bootstrap-typeahead.js
package.json
|
2012-12-10 00:22:22 +01:00 |
|
Mark Otto
|
12aa060efd
|
Merge branch 'jblotus-patch-1' into 2.2.2-wip
|
2012-11-29 21:06:20 -08:00 |
|
Mark Otto
|
e9c32fdf6d
|
Merge branch 'patch-1' of https://github.com/jblotus/bootstrap into jblotus-patch-1
|
2012-11-29 21:06:11 -08:00 |
|
Arnold Daniels
|
176ab8f778
|
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip
Conflicts:
Makefile
README.md
docs/assets/css/docs.css
docs/assets/js/bootstrap.min.js
docs/base-css.html
docs/build/index.js
docs/components.html
docs/customize.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/index.mustache
js/bootstrap-typeahead.js
package.json
|
2012-11-29 23:58:46 +01: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 |
|
fat
|
92e7f166e7
|
remove haunt, remove bootstrap dir, add bower support
|
2012-10-29 21:27:34 -07:00 |
|
Arnold Daniels
|
4dfd29aeac
|
Changed name of project in package.json back to bootstrap
|
2012-10-19 20:24:08 +02:00 |
|
Arnold Daniels
|
9fcb8deb18
|
Use correct version in docs + readme + Makefile
Added the use of versions for Google analytics
Changed favicon
Modified package.json
|
2012-10-15 13:57:51 +02:00 |
|
James Fuller
|
d19ca23f8f
|
Update package.json
when building using Makefile, dependency for hogan.js needs to be installed
|
2012-10-11 21:30:04 -03: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
|
a12c19b3c8
|
updated package and readme
|
2012-08-19 23:05:16 -07:00 |
|
Jacob Thornton
|
ebc6935663
|
2.0.3 -> 2.0.4
|
2012-06-01 11:04:27 -07:00 |
|
Jacob Thornton
|
c408d8961b
|
rewrite server.js, fix travis
|
2012-04-23 03:44:32 -07:00 |
|
Jacob Thornton
|
03f78f7a60
|
run qunit tests in phantomjs for travis-ci
|
2012-04-19 17:34:07 -07:00 |
|
Jacob Thornton
|
1160935446
|
make a few changes to package.json (add make test to makefile)
|
2012-04-19 16:38:43 -07:00 |
|
Chris Aniszczyk
|
c99dcd2e93
|
Add Travis CI Support
Continous integration is nice, fixes #3155
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
|
2012-04-19 16:09:59 -07:00 |
|