From 3a97697456534d19d5e1e4fe4010822611c786e6 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 13 Jan 2014 18:19:37 -0800 Subject: 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. --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 14d42ab7e..6d44ee937 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ } ], "devDependencies": { + "browserstack-runner": "~0.0.13", "btoa": "~1.1.1", "grunt": "~0.4.2", "grunt-banner": "~0.2.0", -- cgit v1.2.3 From a8e14bf1f810c68a52480a21063538fbf3673c82 Mon Sep 17 00:00:00 2001 From: Rahul Nawani Date: Thu, 16 Jan 2014 11:55:44 +0530 Subject: update browserstack-runner package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 6d44ee937..b200c7e43 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ } ], "devDependencies": { - "browserstack-runner": "~0.0.13", + "browserstack-runner": "~0.0.14", "btoa": "~1.1.1", "grunt": "~0.4.2", "grunt-banner": "~0.2.0", -- cgit v1.2.3 From 58c4a8c0f18a10687ce63bd274fa2e4b8723f0fb Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 17 Jan 2014 11:56:53 -0800 Subject: bump grunt-contrib-qunit to v0.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index b200c7e43..4d73b69d1 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "grunt-contrib-jade": "~0.9.1", "grunt-contrib-jshint": "~0.8.0", "grunt-contrib-less": "~0.9.0", - "grunt-contrib-qunit": "~0.3.0", + "grunt-contrib-qunit": "~0.4.0", "grunt-contrib-uglify": "~0.2.7", "grunt-contrib-watch": "~0.5.3", "grunt-csscomb": "~2.0.1", -- cgit v1.2.3 From 9818ad532e0db599ef48afa552a29cce99d5a0a9 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 19 Jan 2014 11:50:40 +0200 Subject: Update grunt-contrib-uglify dependency. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 4d73b69d1..14e0400aa 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "grunt-contrib-jshint": "~0.8.0", "grunt-contrib-less": "~0.9.0", "grunt-contrib-qunit": "~0.4.0", - "grunt-contrib-uglify": "~0.2.7", + "grunt-contrib-uglify": "~0.3.0", "grunt-contrib-watch": "~0.5.3", "grunt-csscomb": "~2.0.1", "grunt-html-validation": "~0.1.13", -- cgit v1.2.3 From 6c7db9d56e572cbde7eedb58abe3a8876c6d2d81 Mon Sep 17 00:00:00 2001 From: Rahul Nawani Date: Wed, 22 Jan 2014 21:15:55 +0530 Subject: update browserstack runner package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 14e0400aa..2a8e613bd 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ } ], "devDependencies": { - "browserstack-runner": "~0.0.14", + "browserstack-runner": "~0.0.15", "btoa": "~1.1.1", "grunt": "~0.4.2", "grunt-banner": "~0.2.0", -- cgit v1.2.3 From 72568ce588e5925d7d36a26c02f6e9f227344c70 Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Sat, 25 Jan 2014 21:03:44 +0100 Subject: Update load-grunt-tasks to v0.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 2a8e613bd..20bb8b24c 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "grunt-jscs-checker": "~0.3.0", "grunt-saucelabs": "~4.1.2", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~0.2.1", + "load-grunt-tasks": "~0.3.0", "markdown": "~0.5.0" }, "jspm": { -- cgit v1.2.3 From 5a3f1a90ba37a4d1c090dc1fa59b9f4501481adb Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 20 Jan 2014 13:06:13 -0800 Subject: fix #12261 --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 2a8e613bd..9dfef4f2f 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "devDependencies": { "browserstack-runner": "~0.0.15", "btoa": "~1.1.1", + "canonical-json": "~0.0.3", "grunt": "~0.4.2", "grunt-banner": "~0.2.0", "grunt-contrib-clean": "~0.5.0", @@ -42,6 +43,7 @@ "grunt-contrib-uglify": "~0.3.0", "grunt-contrib-watch": "~0.5.3", "grunt-csscomb": "~2.0.1", + "grunt-exec": "0.4.3", "grunt-html-validation": "~0.1.13", "grunt-jekyll": "~0.4.1", "grunt-jscs-checker": "~0.3.0", -- cgit v1.2.3 From 1409cde7e800ca83fd761f87e5ad8f0d259e38d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 30 Jan 2014 08:30:37 -0800 Subject: Bump versions, run grunt --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 40c4a81bb..6b38c31ab 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", - "version": "3.0.3", + "version": "3.1.0", "keywords": [ "bootstrap", "css" -- cgit v1.2.3 From dd6bb5a33574fd9d5bd598bb13ba336ae3953844 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 30 Jan 2014 12:30:55 -0800 Subject: update to grunt-saucelabs v5.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 6b38c31ab..adb3f877a 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "grunt-html-validation": "~0.1.13", "grunt-jekyll": "~0.4.1", "grunt-jscs-checker": "~0.3.0", - "grunt-saucelabs": "~4.1.2", + "grunt-saucelabs": "~5.0.0", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.3.0", "markdown": "~0.5.0" -- cgit v1.2.3 From bf0cedc6241192cf2b166632924e3485eba69b00 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 30 Jan 2014 12:32:30 -0800 Subject: update to browserstack-runner v0.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 6b38c31ab..0c23cfa2d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ } ], "devDependencies": { - "browserstack-runner": "~0.0.15", + "browserstack-runner": "~0.1.0", "btoa": "~1.1.1", "canonical-json": "~0.0.3", "grunt": "~0.4.2", -- cgit v1.2.3 From fd9b29b43e089719ca6d6b690f83874a05a83ab8 Mon Sep 17 00:00:00 2001 From: Daniel Erickson Date: Sun, 2 Feb 2014 17:33:40 -0800 Subject: Allow the bootstrap package in npm to expose css and less --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 6b38c31ab..52bcb4dc8 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,8 @@ "scripts": { "test": "grunt test" }, + "style": "./dist/css/bootstrap.css", + "less": "./less/bootstrap.less", "repository": { "type": "git", "url": "https://github.com/twbs/bootstrap.git" -- cgit v1.2.3 From 96fd2dca020d6c43c5797cc29caec7bedb917d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 6 Feb 2014 11:37:39 +0100 Subject: Use license object instead of licenses array --- package.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index b93ae15ba..8e6c43494 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,10 @@ "bugs": { "url": "https://github.com/twbs/bootstrap/issues" }, - "licenses": [ - { - "type": "MIT", - "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" - } - ], + "license": { + "type": "MIT", + "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" + }, "devDependencies": { "browserstack-runner": "~0.1.0", "btoa": "~1.1.1", -- cgit v1.2.3