0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-05 17:24:20 +01:00
Commit Graph

422 Commits

Author SHA1 Message Date
Mark Otto
529ecc5a77 Version bump 2012-12-10 18:31:04 -08: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
439ff09701 herpderp 2012-12-02 18:15:40 -08:00
Mark Otto
c8862d91bc Readme reorg
* Consolidate quick start options into easier to read list
* Consolidate social and community options into a list
* Add link to Code Guide for contributions section
2012-12-02 13:14:49 -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
Mark Otto
46347fff01 fixes #5692: add version # to readme 2012-10-31 11:17:01 -07:00
fat
f595e146d6 http link 2012-10-29 21:29:05 -07:00
fat
92e7f166e7 remove haunt, remove bootstrap dir, add bower support 2012-10-29 21:27:34 -07:00
Bradly Feeley
fda641fb6c Updating README link about Less compilation. 2012-10-13 18:38:34 -07:00
Mark Otto
d76c305cbb remove 'at twitter' part of readme 2012-10-06 14:42:07 -07:00
Mark Otto
582b178723 fixes #4542 manually: typo in phantomjs and space between url in markdown 2012-08-22 10:44:41 -07:00
Mark Otto
a12c19b3c8 updated package and readme 2012-08-19 23:05:16 -07:00
Mark Otto
f61dd7239b fixes #4277: typo 2012-08-05 00:15:09 -07:00
Mark Otto
b05fc00d59 fixes #4148, readme typo 2012-07-23 12:51:36 -07:00
Mark Otto
3d770ab7bd Merge branch 'philfreo-patch-1' into 2.1.0-wip 2012-07-06 10:22:53 -07:00
Phil Freo
4d6434a2c7 Adding 'connect' npm requirement as it is required to run make test (in order for it to run node js/tests/server.js) 2012-07-03 23:34:11 -07:00
Mark Otto
f109be4e8a update readme to match master 2012-06-07 10:31:52 -07:00
Mark Otto
857b8fb8be Update master 2012-06-07 10:31:26 -07:00
Jacob Thornton
b8a8927b0c add link to phantomjs in docs #3347 2012-06-02 18:36:45 -07:00
Jacob Thornton
ebc6935663 2.0.3 -> 2.0.4 2012-06-01 11:04:27 -07:00
Jacob Thornton
a85c8fe74e add note about contributing 2012-05-27 20:07:58 -07:00
Jacob Thornton
03f78f7a60 run qunit tests in phantomjs for travis-ci 2012-04-19 17:34:07 -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
Jacob Thornton
edb52a82d8 make bootstrap compile with Recess instead of Less 2012-04-18 16:16:42 -07:00
Jacob Thornton
575f18aaf4 add jshint support + a few minor stylistic changes 2012-04-14 16:29:53 -07:00
TJ Rana
7ea34ae0ef Add "the" on lines 28 and 29 2012-03-22 23:31:52 -07:00
TJ Rana
7376eef378 Add s to bumps on line 30 2012-03-22 23:31:52 -07:00
TJ Rana
303ba1326b Make guidelines for release numbering more specific 2012-03-22 23:31:52 -07:00
Mark Otto
d335adf644 Updated readme to include blog mention 2012-03-22 00:33:18 -07:00
Mark Otto
9f608411cb no more uppercase in readme 2012-02-19 22:53:34 -08:00
Mark Otto
f81e5fbe9f readme cleanup 2012-02-19 22:52:32 -08:00
Jacob Thornton
03e6dc66c2 Merge branch '2.0.1-wip' 2012-02-16 22:41:02 -08:00
Jacob Thornton
9143d8e449 update irc spacing in readme 2012-02-13 18:11:41 -08:00
Jacob Thornton
28cfa8be03 add irc note 2012-02-13 18:10:36 -08:00
Mark Otto
16f2e0e19e add link to docs compiling section in readme 2012-02-12 16:05:25 -08:00
Mark Otto
87ed82207a update readme to clarify dependencies of make command, per #1756 2012-02-12 16:04:02 -08:00
TannerNMO
11319f6da9 Fixed simple grammatical errors. http://grammar.quickanddirtytips.com/backward-versus-backwards.aspx 2012-02-01 14:14:49 -07:00
Jacob Thornton
a25f0cce95 simplify readme 2012-01-26 22:11:32 -08:00
Mark Otto
16eccc43d9 dates updated to 2012 2012-01-14 23:28:48 -08:00
Silumesii Maboshe
1af3596a5e Capitalising 'Bootstrap' and abbreviations. Fixing typos. 2011-11-28 08:13:54 +02:00
Jacob Thornton
f03f7da08b fix readme link spacing 2011-09-16 12:30:30 -07:00
Jacob Thornton
c7c5ce8dcd Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
2011-09-16 11:24:07 -07:00
Jacob Thornton
472632ba51 mv 1.3.0 file names to plane bootstrap.css for submodulers 2011-09-15 23:09:56 -07:00
Mark Otto
427a001c47 Link Twitter account in readme 2011-09-12 14:33:39 -07:00
Mark Otto
a218475ffc Edited README.md via GitHub 2011-09-12 14:33:00 -07:00
Sam Soffes
86bb0733a2 Add pretty code coloring to readme 2011-09-11 21:56:54 -07:00
Mark Otto
1c03a07591 bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere 2011-09-08 10:36:56 -07:00
Jacob Thornton
90d174a34d Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	README.md
	bootstrap-1.2.0.css
2011-08-30 23:37:46 -07:00
Jacob Thornton
4fb1c5bd4b rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html 2011-08-30 23:34:19 -07:00
David Haywood Smith
a16dfb735a Fixed readme spelling mistake, closes #123 2011-08-30 11:19:46 +01:00
Mark Otto
f17fc367f7 le merging conflicts 2011-08-29 21:26:53 -07:00
Mark Otto
315af8e18b Edited readme to include the versioning approach we'll be striving to use 2011-08-27 00:49:48 -07:00
Jacob Thornton
273659c8e7 update everything to 1.1.1 2011-08-26 11:13:47 -07:00
Jacob Thornton
3ef86aa703 v1.1.0 2011-08-21 22:30:39 -07:00
Jacob Thornton
1a805151da clean up readme 2011-08-19 11:25:19 -07:00
Chris Aniszczyk
3ad9febe04 Edited README.md via GitHub 2011-08-18 16:58:49 -07:00
Chris Aniszczyk
9de97057ec Cleaned up README.md - modified mailing list and google group 2011-08-18 16:58:22 -07:00
Jacob Thornton
088b81f7cd update readme with info about makefile for devs 2011-08-18 14:45:07 -07:00
Mark Otto
ae02a8a300 Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-08-18 11:39:22 -07:00
Jacob Thornton
6d57f8a3db add google group 2011-08-18 11:37:18 -07:00
Mark Otto
8ba5a29456 capitalize github properly, fix url for compiled css 2011-08-17 22:38:14 -07:00
Jacob Thornton
9ec3bdd2d8 fix doc link in readme 2011-08-16 23:15:45 -07:00
Jacob Thornton
f53ddcc6fe add link to docs 2011-08-16 23:14:09 -07:00
Jacob Thornton
6d0b083b7d update whitspace and comment styles 2011-08-16 22:58:01 -07:00
Jacob Thornton
5eb962faea Boostrap lulz 2011-07-29 14:28:37 -07:00
Jacob Thornton
a480e0f3f3 add github links 2011-07-29 14:26:33 -07:00
Jacob Thornton
946efe97cb fix up readme md 2011-07-29 14:24:27 -07:00
Mark Otto
68d4b85ffc no idea what these changes are 2011-07-29 12:30:59 -07:00
Mark Otto
e0b09867c2 fix spacing in readme 2011-06-29 07:54:55 -07:00
Jacob Thornton
0a627019a5 add to readme + add license 2011-05-10 15:30:49 -07:00
Jacob Thornton
96c3e70996 cleanup old stuff 2011-05-03 18:12:43 -07:00