Skip to content

Commit

Permalink
Merge branch 'develop' into gh-pages
Browse files Browse the repository at this point in the history
* develop:
  v4.0.1
  chore(package): update moment to version 2.14.1 (#856)
  fix(tests): prevent FF from timing out (#855)
  chore(package): update moment to version 2.14.0 (#853)
  chore(package): update marcosc-async to version 3.0.0 (#854)
  chore(package): update jscs to version 3.0.6 (#850)
  chore(package): update marcosc-async to version 2.0.3
  chore(package): update marcosc-async dep
  • Loading branch information
marcoscaceres committed Jul 4, 2016
2 parents 1d44a5c + 3f0b288 commit b920003
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion builds/respec-w3c-common.build.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions builds/respec-w3c-common.js

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "respec",
"version": "4.0.0",
"version": "4.0.1",
"license": "W3C",
"description": "Specification Edition Support Tool.",
"engines": {
Expand All @@ -15,42 +15,42 @@
},
"author": "Robin Berjon",
"devDependencies": {
"async": "^2.0.0-rc.5",
"async": "^2.0.0-rc.6",
"chai": "^3.5.0",
"colors": "^1.1.2",
"command-line-args": "^3.0.0",
"domReady": "github:requirejs/domReady",
"epipebomb": "^0.1.1",
"express": "^4.13.4",
"express": "^4.14.0",
"fs-extra": "^0.30.0",
"fs-promise": "^0.5.0",
"handlebars": "^4.0.5",
"highlight.js": "github:isagalaev/highlight.js",
"jasmine-core": "^2.4.1",
"jasmine-reporters": "^2.2.0",
"jquery": "^3.0.0",
"js-beautify": "^1.6.2",
"jscs": "^3.0.5",
"js-beautify": "^1.6.3",
"jscs": "^3.0.6",
"jshint": "^2.9.2",
"karma": "^1.0.0",
"karma": "^1.1.0",
"karma-chrome-launcher": "^1.0.1",
"karma-detect-browsers": "^2.1.0",
"karma-firefox-launcher": "^1.0.0",
"karma-ie-launcher": "^1.0.0",
"karma-jasmine": "^1.0.2",
"karma-mocha": "^1.0.1",
"karma-mocha-reporter": "^2.0.3",
"karma-mocha": "^1.1.1",
"karma-mocha-reporter": "^2.0.4",
"karma-opera-launcher": "^1.0.0",
"karma-requirejs": "^1.0.0",
"karma-safari-launcher": "^1.0.0",
"karma-safaritechpreview-launcher": "0.0.4",
"karma-verbose-summary-reporter": "0.0.1",
"marcosc-async": "^2.0.0",
"marcosc-async": "^2.0.3",
"mocha": "^2.5.3",
"moment": "^2.13.0",
"moment": "^2.14.1",
"mozilla-download": "^1.1.1",
"nightmare": "^2.5.0",
"promise-polyfill": "^5.2.0",
"nightmare": "^2.5.2",
"promise-polyfill": "^5.2.1",
"prompt": "^1.0.0",
"requirejs": "^2.2.0",
"text": "github:requirejs/text",
Expand Down Expand Up @@ -82,7 +82,7 @@
"command-line-args": "^3.0.0",
"command-line-usage": "^3.0.2",
"fs-promise": "^0.5.0",
"marcosc-async": "^1.1.3",
"marcosc-async": "^3.0.0",
"marked": "^0.3.5",
"nightmare": "^2.3.3",
"snyk": "1.16.0"
Expand Down
3 changes: 3 additions & 0 deletions tests/test-main.js
Expand Up @@ -30,3 +30,6 @@ require.config({
"deps/jquery": "/base/js/deps/jquery",
},
});

// Attempt to reduce timeout errors
jasmine.DEFAULT_TIMEOUT_INTERVAL = jasmine.DEFAULT_TIMEOUT_INTERVAL * 2;

0 comments on commit b920003

Please sign in to comment.