rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
11,933 Commits 108 Branches 89 Tags 547 MiB
09fb80568a
Commit Graph

248 Commits

Author SHA1 Message Date
Zlatan Vasović
96fd2dca02 Use license object instead of licenses array 2014-02-06 11:37:39 +01:00
Mark Otto
81d9a46dcd Merge pull request #12534 from Techwraith/patch-1 
Allow the bootstrap package in npm to expose css and less
 2014-02-05 13:54:53 -08:00
Daniel Erickson
fd9b29b43e Allow the bootstrap package in npm to expose css and less 2014-02-02 17:33:40 -08:00
Chris Rebert
00685be0e9 Merge pull request #12445 from twbs/browserstack-runner-update 
update to browserstack-runner v0.1.0
 2014-01-30 13:01:07 -08:00
Chris Rebert
bf0cedc624 update to browserstack-runner v0.1.0 2014-01-30 12:32:30 -08:00
Chris Rebert
dd6bb5a335 update to grunt-saucelabs v5.0.0 2014-01-30 12:30:55 -08:00
Mark Otto
1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Chris Rebert
50ad304bb5 Merge pull request #12315 from twbs/use-shrinkwrap 
Do npm caching based on npm-shrinkwrap.canonical.json
 2014-01-26 20:46:14 -08:00
Chris Rebert
5a3f1a90ba fix #12261 2014-01-26 14:22:06 -08:00
Heinrich Fenkart
72568ce588 Update load-grunt-tasks to v0.3.0 2014-01-25 21:03:44 +01:00
Rahul Nawani
6c7db9d56e update browserstack runner package 2014-01-22 21:15:55 +05:30
XhmikosR
9818ad532e Update grunt-contrib-uglify dependency. 2014-01-20 09:37:02 +02:00
Chris Rebert
58c4a8c0f1 bump grunt-contrib-qunit to v0.4.0 2014-01-17 11:56:53 -08:00
Rahul Nawani
a8e14bf1f8 update browserstack-runner package 2014-01-16 11:55:44 +05:30
Chris Rebert
3a97697456 tests: run BrowserStack in parallel with Sauce Labs 
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-31922999
and internal twbs team discussion.
Effectively reverts the deletions from #11701.
 2014-01-14 14:13:52 -08:00
Mark Otto
e68d3b961e Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets 
Conflicts:
	package.json
 2014-01-11 14:48:04 -08:00
Chris Rebert
7ba6daabfe bump grunt-contrib-jade to v0.9.1 2014-01-08 21:15:37 -08:00
Chris Rebert
39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095 
also updates variables file organization (courtesy @mdo)
 2014-01-08 12:41:51 -08:00
XhmikosR
f00bbdd994 Minify docs CSS too. 2014-01-08 13:41:17 +02:00
Chris Rebert
9ae5d321b5 bump grunt-contrib-less to v0.9.0 2014-01-07 19:50:58 -08:00
Zlatan Vasović
17fb7aee2d Update dependencies (again) 2013-12-31 19:20:57 +01:00
Zlatan Vasović
2426a2aeef Update dependencies 
Updates grunt-html-validation and grunt-jekyll dependencies.
 2013-12-26 21:55:55 +01:00
XhmikosR
b590b268ad Update dependencies. 2013-12-26 19:54:04 +02:00
Mark Otto
679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
Mark Otto
4376ce8466 Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces 2013-12-23 13:25:51 -08:00
Mark Otto
45a8a9508e Merge pull request #11974 from XhmikosR/meta 
Normalize meta
 2013-12-22 22:20:23 -08:00
Mark Otto
cb7cdd0c05 Revert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSS 2013-12-22 21:18:45 -08:00
Zlatan Vasović
88c3619d2c Update dependencies 2013-12-22 19:01:00 +01:00
XhmikosR
29aaf66a8a Normalize package.json. 2013-12-22 08:59:36 +02:00
Mark Otto
e1bd300f2f Merge pull request #11960 from ZDroid/no-leading-commas-json 
Drop remaining leading commas
 2013-12-20 11:18:04 -08:00
Zlatan Vasović
b604c2fbac Drop remaining leading commas 2013-12-20 20:09:51 +01:00
Zlatan Vasović
e95c396f44 Update grunt-csscomb dependency 
Per David DM.
 2013-12-20 19:59:18 +01:00
Mark Otto
40651cf1ea more license mentions 2013-12-18 15:08:16 -08:00
Mark Otto
e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
Chris Rebert
af1afb10bd upgrade to grunt-html-validation v0.1.11 2013-12-17 01:29:19 -08:00
Mark Otto
55f6beb427 Merge branch 'master' into pr/11776 
Conflicts:
	package.json
 2013-12-15 14:09:50 -08:00
Mark Otto
9a8e619543 Fixes #11871: commas last 2013-12-15 10:57:11 -08:00
Tobias Lindig
9f12f840b9 Buildprocess: use module "load-grunt-tasks" to load grunt tasks directly from the package.json 2013-12-10 10:28:44 +01:00
Mark Otto
d466d527a4 Undo merge of #11778 and use cleancss min option 2013-12-09 00:12:11 -08:00
Mark Otto
de218bbba8 Merge branch 'pr/11779' into drop_recess_for_less 
Conflicts:
	Gruntfile.js
	package.json
 2013-12-08 23:56:22 -08:00
Mark Otto
ea61a19a04 Merge branch 'pr/11778' into drop_recess_for_less 
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
 2013-12-08 23:48:07 -08:00
Mark Otto
c0200426ee Drop grunt-recess for grunt-contrib-less & co 2013-12-08 19:09:27 -08:00
XhmikosR
cbfbf1b2dd Add csslint support. 2013-12-08 13:23:25 +02:00
XhmikosR
fdc5d1dc34 Minify css with clean-css. 2013-12-08 13:05:10 +02:00
Zlatan Vasović
0c457d48f8 Drop redundant module import 2013-12-08 11:24:47 +01:00
Chris Rebert
c1dae1e13c integrate JSCS 2013-12-06 17:26:07 -08:00
Chris Rebert
bd9332a58a switch to Sauce Labs for our cross-browser JS unit testing needs 
Fixes #11087
 2013-12-03 21:57:22 -08:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Guy Bedford
ac6cfbbaad include jspm package configuration 2013-11-26 12:10:06 +02:00
Zlatan Vasović
4160ff0e44 Kick up grunt-recess dependency 2013-11-23 17:41:31 +01:00
Mark Otto
6a42305565 bump versions to v3.0.2 2013-11-06 12:57:28 -08:00
Chris Rebert
0bb122a377 add Grunt task to change version numbers; fixes #11332 2013-11-04 11:22:30 -08:00
Mark Otto
867e2bef8d 3.0.1 2013-10-30 10:03:56 -07:00
Zlatan Vasović
ca6729e3d3 Kick up grunt-contrib-jshint dependency 2013-10-25 17:45:49 +02:00
Chris Rebert
0d122fc323 silence validator regarding http-equiv="X-UA-Compatible" 2013-10-23 23:25:17 -07:00
Zlatan Vasović
c75f8a5bf6 Sort dependencies A-Z 2013-10-13 05:31:47 -07:00
herom
aad70834fc Fixes #9925: convert font data to base64, fixing 0xefbfbd (Unicode Replacement Character) chars in customizer fonts. 
Merges #9982
 2013-10-09 18:03:04 -07:00
Zlatan Vasović
ef3ac6808f Updare grunt-jekyll dependency 2013-10-09 08:33:03 +02:00
Zlatan Vasović
2306375d13 Update qunit dependency 2013-09-30 09:36:20 +02:00
XhmikosR
3c0489102e Sort by name. 2013-09-18 20:36:17 +03:00
Zlatan Vasović
d7fb54e5fb Remove "js" keyword /cc @cvrebert 2013-09-16 20:40:12 +02:00
Zlatan Vasović
66abfe577e Fix package.json 
* Add "js" keyword
* Fix homepage link
* Bump grunt-contrib-connect to newer version
 2013-09-16 19:42:52 +02:00
Chris Rebert
1f3a87a8a0 fix punctuation in author field of package.json 2013-09-10 19:12:47 -07:00
Chris Rebert
d10ed7ef5e bump minor/patch versions of other dependencies 2013-09-04 14:15:51 -07:00
Chris Rebert
07075456b7 bump grunt-recess to 0.4.0 2013-09-04 14:09:22 -07:00
Chris Rebert
82d19a41ba bump grunt-contrib-connect to 0.4.0 
Thanks David.
 2013-09-03 12:17:30 -07:00
XhmikosR
26728576f3 Add bugs property to package.json. 2013-08-27 17:21:15 +03:00
Nick Schonning
ca63686fda Use NPM version of grunt-html-validation 
The package is now published, so the direct git url is no longer
required
 2013-08-22 12:20:56 -04:00
Mark Otto
1e0453f825 Restore glyphicons 2013-08-18 00:36:51 -07:00
Chris Rebert
bb5be0a2f9 add HTML5 validation of docs pages to the build 2013-08-12 17:49:01 -07:00
Rohan Jain
093cda244a Integrate testing with browserstack 2013-08-06 12:24:14 -07:00
John-Philip Johansson
0d33455ef4 Replace Makefile with GruntJS 
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
 2013-07-26 00:39:14 -07:00
Chris Rebert
90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
liuyl
2c00a2fe2f change version of recess to 1.1.7 2013-06-13 19:27:26 +08:00
Jacob Thornton
ccfa989898 upgrade jshint to 2.1.2 for anton <3 2013-05-21 19:31:51 -07:00
Mark Otto
e45f12ad42 rearrange jekyll and docs 2013-02-12 12:44:41 -08:00
Mark Otto
43da258bd9 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
 2013-02-05 19:53:44 -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
72f13e2870 Merge branch '2.2.3' into 3.0.0-wip 
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	less/type.less
	package.json
 2012-12-20 00:02:52 -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
Mark Otto
98b0d475ae version bump to 3.0 2012-11-30 22:30:50 -08: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
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
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