Skip to content

Commit

Permalink
Merge branch 'master' into relatedLinks-on-timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
iamigo committed Dec 13, 2016
2 parents 2440d01 + 6a10ef1 commit 3b6210b
Show file tree
Hide file tree
Showing 7 changed files with 796 additions and 249 deletions.
9 changes: 9 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,15 @@
"type": "git",
"url": "https://github.com/Salesforce/refocus.git"
},
"watch": {
"test-view": {
"patterns": ["view/perspective", "tests/view/components"],
"extensions": "js,jsx",
"quiet": true
}
},
"scripts": {
"watch": "npm-watch",
"cleanup": "npm run dropdb && npm run initdb && npm run checkdb",
"build": "NODE_ENV=development && webpack --config ./webpack.config.js --progress --profile",
"checkdb": "node db/createOrUpdateDb.js",
Expand Down Expand Up @@ -86,6 +94,7 @@
"multer": "^1.0.3",
"nock": "^3.6.0",
"npm": "^3.10.9",
"npm-watch": "^0.1.6",
"passport": "^0.3.2",
"passport-local": "^1.0.0",
"passport-saml": "^0.15.0",
Expand Down

0 comments on commit 3b6210b

Please sign in to comment.