rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Code Issues Actions Packages Releases Activity
14,157 Commits 108 Branches 89 Tags 547 MiB
5744c58556
Commit Graph

282 Commits

Author SHA1 Message Date
Mark Otto
9a7e365c2c bump version to v3.3.1 2014-11-12 09:03:16 -08:00
XhmikosR
07c1881bc2 Update npm-shrinkwrap. 2014-11-12 09:51:28 +02:00
XhmikosR
7047f9df14 Update devDependencies. 2014-11-10 12:54:23 +02:00
Mark Otto
34c2f46c8b Merge branch 'master' into v3.3.0 2014-10-29 09:45:09 -07:00
Mark Otto
22baa8153b fixes #14911: bump dependencies to fix customizer text from being cut shor 2014-10-29 09:42:00 -07:00
Mark Otto
94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
jonschlinkert
3e9b461766 Replaces markdown.js with [remarkable](https://github.com/jonschlinkert/remarkable). 
- remarkable has 100% support for [commonmark](http://jgm.github.io/CommonMark/spec.html)
  - [faster](https://github.com/jonschlinkert/remarkable/tree/master/benchmark)
  - easier to monkeypatch. this is a goal of ours, might be useful to you at some point given the custom tokenizing/parsing you're doing for documentation.
 2014-10-26 06:38:10 -04:00
Mark Otto
0521913a99 Merge pull request #13824 from jsdf/node-requirable 
Allow npm package to be resolved via node module resolution
 2014-10-25 19:43:05 -07:00
XhmikosR
0ad97ab446 Update node dependencies. 2014-10-25 14:12:20 +03:00
XhmikosR
d59b235242 Update node dependencies. 2014-10-23 13:26:48 -07:00
Daijiro Wachi
2b70f94b15 Update grunt-contrib-jade version 2014-10-02 13:30:36 +09:00
XhmikosR
e26fcf470f Update dependencies. 
Close #14664.
 2014-09-25 18:39:42 +03:00
XhmikosR
5befcb991c Update dependencies. 2014-09-08 09:03:26 +03:00
XhmikosR
fe896923fc Update grunt-jscs. 2014-08-30 08:43:44 +03:00
James Friend
9aeaf19b1d Merge remote-tracking branch 'upstream/master' into node-requirable 
Conflicts:
	Gruntfile.js
 2014-08-28 09:32:08 +08:00
XhmikosR
701c27e22e Update dev dependencies. 2014-08-26 13:51:05 +03:00
Chris Rebert
b3e8001be2 bump grunt-autoprefixer to ~1.0.0 2014-08-05 18:38:29 -07:00
James Friend
689faaf16f added a separate npm-specific main file 2014-08-05 10:51:31 +08:00
Chris Rebert
460294ff77 bump grunt-saucelabs to ~8.2.0 2014-07-31 13:16:04 -07:00
Chris Rebert
80ca659154 bump grunt-contrib-clean to ~0.6.0 2014-07-31 13:15:27 -07:00
XhmikosR
88b4016ce6 Update all devDependencies. 2014-07-22 08:31:26 +03:00
XhmikosR
7ba5c5d5e4 Update grunt-csscomb. 2014-07-22 08:25:35 +03:00
XhmikosR
503ec4e5db Update dependencies. 2014-07-10 09:58:23 +03:00
XhmikosR
0a8845c3fd Update package.json. 
* "grunt-jscs-checker" was renamed to "grunt-jscs"
* update deps
 2014-07-06 14:25:56 +03:00
XhmikosR
a013c112c4 Update dependencies. 2014-07-01 07:32:50 +03:00
XhmikosR
225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
XhmikosR
fec94e1695 Update "grunt-autoprefixer". 2014-06-27 07:38:46 +03:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Chris Rebert
df1aee56df upgrade grunt-saucelabs to ~8.1.0 
update shrinkwrap too
 2014-06-24 12:17:24 -07:00
XhmikosR
dc7da296e4 Update dependencies. 2014-06-24 18:58:38 +03:00
XhmikosR
898328655f Update dependencies. 2014-06-23 03:12:16 +03:00
Chris Rebert
856bc8694c bump npm-shrinkwrap to ~3.1.4 2014-06-19 16:04:40 -07:00
Heinrich Fenkart
7bc8db9558 Bump grunt-jscs-checker to 0.5.1 2014-06-19 21:08:04 +02:00
Chris Rebert
3c4ba2a08c Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation 
Instead of our homegrown grunt/shrinkwrap.js
Fixes #13483.
New npm-shrinkwrap.json is human-readable but still in a consistent/stable format.
Should aid debugging, produce better diffs, and be less prone to merge conflicts
 2014-06-19 11:46:37 -07:00
XhmikosR
e42de7511a Update dependencies. 2014-06-17 18:29:17 -07:00
James Friend
33a6932d6f added 'main' field to package.json 2014-06-15 12:53:26 +08:00
Chris Rebert
624800aa4f bump load-grunt-tasks to ~0.5.0 
[skip validator] [skip sauce]
 2014-06-13 12:02:14 -07:00
Chris Rebert
2213a5b756 bump grunt-contrib-connect to ~0.8.0 2014-06-09 17:32:10 -07:00
Chris Rebert
f0c97bf758 bump grunt-saucelabs to ~8.0.2 2014-06-04 12:38:26 -07:00
Chris Rebert
34621740b3 bump grunt-contrib-jade to ~0.12.0 2014-06-04 12:06:47 -07:00
Chris Rebert
094e42883a bump grunt-contrib-qunit to ~0.5.1 2014-06-04 12:06:03 -07:00
Chris Rebert
7b2600cfc5 bump grunt-saucelabs to ~7.0.0 2014-05-23 12:53:12 -07:00
Chris Rebert
8be8fb61bb bump glob to ^4.0.0 2014-05-23 12:29:24 -07:00
Chris Rebert
6fef447a62 bump grunt-saucelabs to v5.1.3 2014-05-13 14:54:41 -07:00
Mark Otto
f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
Chris Rebert
150ca95b19 unlock & bump grunt-jscs-checker to ~0.4.3 2014-05-07 13:28:02 -07:00
Chris Rebert
64fdbd7621 bump grunt-jscs-checker to v0.4.1; refs #13512 2014-05-05 12:31:17 -07:00
Chris Rebert
b100e15d41 temporarily lock grunt-jscs-checker to v0.4.0 
Per #13512 & https://github.com/mdevils/node-jscs/issues/357
 2014-05-05 12:08:04 -07:00
Chris Rebert
348e7a011a bump grunt-css-flip to ~0.2.2 2014-05-03 16:43:02 -07:00
XhmikosR
76e717b233 Update dependencies. 2014-04-03 10:52:32 +03:00
XhmikosR
367da423c4 Update "grunt-contrib-concat" dependency. 2014-04-01 08:26:39 +03:00
Chris Rebert
db6572e726 bump patch versions of 3 grunt tasks 2014-03-30 17:26:13 -07:00
Chris Rebert
35d34ccfaa bump grunt-saucelabs to v5.1.1 2014-03-30 17:17:59 -07:00
Chris Rebert
24c5a453b2 use glob instead of fs.readdirSync since /less now has subdirs 2014-03-28 11:12:28 -07:00
XhmikosR
30cc625c5c Update time-grunt to v0.3.1. 2014-03-23 08:13:38 +02:00
XhmikosR
f2952aeccf Update grunt-contrib-less to v0.11.0. 2014-03-20 07:29:07 +02:00
XhmikosR
d475da5b0f Update dependencies. 2014-03-16 06:53:15 +02:00
Chris Rebert
1751922ca0 upgrade to grunt-css-flip v0.2.0 2014-03-12 16:59:58 -07:00
Chris Rebert
327980ddb0 remove unnecessary direct devDependency on css-flip 2014-03-12 16:51:12 -07:00
XhmikosR
d4a4bbb729 Update dependencies. 2014-03-12 20:22:22 +02:00
Zlatan Vasović
f9a56c28db Remove ./ from package.json paths 2014-03-07 23:07:38 +01:00
Bas Bosman
cb7eb674ac Add autoprefixer 2014-03-07 09:01:54 +01:00
XhmikosR
73ad81d89c Add time-grunt plugin. 2014-03-07 08:47:23 +02:00
XhmikosR
589f872d74 Remove duplicate dependency. 2014-03-07 08:45:16 +02:00
XhmikosR
29d2de869e Specify engines in package.json. 
Things don't work with older versions.
 2014-03-07 08:44:43 +02:00
Chris Rebert
56a5d93b82 switch to grunt-css-flip for RTL CSS generation 2014-03-06 12:31:28 -08:00
Zlatan Vasović
58201d7f11 grunt-contrib-jade@0.11.0 2014-03-05 09:25:35 +01:00
Mark Otto
af39290a9d Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip 
Conflicts:
	Gruntfile.js
	package.json
	test-infra/npm-shrinkwrap.canonical.json
 2014-03-03 21:52:56 -08:00
Chris Rebert
6f1cc694fe add more keywords to package.json & composer.json 2014-03-03 14:22:19 -08:00
Mark Otto
745111ba52 Match docs for description 2014-03-03 14:18:03 -08:00
XhmikosR
cd65e512a2 Update dependencies. 2014-03-02 09:27:01 +02:00
XhmikosR
256baf8026 Update grunt-contib-less. 2014-03-01 20:58:26 +02:00
XhmikosR
63031a3ca5 Bump grunt-jscs-checker. 2014-02-26 19:32:43 +02:00
XhmikosR
db9fca23ff Update load-grunt-tasks. 2014-02-26 19:32:30 +02:00
Chris Rebert
bc8c33c82f Merge pull request #12829 from ZDroid/no-bs-keyword 
Remove bootstrap keyword from package.json
 2014-02-26 09:10:32 -08:00
Zlatan Vasović
db69420d74 Remove bootstrap keyword 2014-02-26 13:46:06 +01:00
Chris Rebert
e40c1e5e6d add Grunt task for css-flip-ing & add RTL to Gruntfile configs 2014-02-25 10:31:02 -08:00
Mark Otto
429fc9331e grunt dist 2014-02-24 19:10:23 -08:00
XhmikosR
af83e569c3 Update grunt-contrib-connect. 2014-02-23 10:56:27 +02:00
XhmikosR
db32afe6cf Update grunt-contrib-cssmin. 2014-02-18 07:40:02 +02:00
Chris Rebert
cdb381bb75 bump grunt-exec to v0.4.5 & add missing tilde to version spec 2014-02-13 13:55:36 -08:00
XhmikosR
2d18944d98 Update dependencies. 2014-02-13 11:12:05 -08:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Chris Rebert
1e1f510294 rm BrowserStack testing from build 2014-02-11 10:11:38 -08:00
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