Merge branch 'master' into clostridium

* master:
  Add clickable to strains chars table
  Sort meas table in chars
  Fixes #33
  Manually sort strains/chars
  Refresh token notes
  Linting
This commit is contained in:
Matthew Ryan Dillon 2015-10-19 15:42:57 -07:00
commit 13f8c5afcc
15 changed files with 80 additions and 36 deletions

View file

@ -28,8 +28,8 @@ module.exports = function(environment) {
authorizationPrefix: 'Bearer ',
authorizationHeaderName: 'Authorization',
refreshAccessTokens: true,
timeFactor: 1000,
refreshLeeway: 300,
timeFactor: 1000, // 1000 ms/s; JWT returned in unix time seconds
refreshLeeway: 1800, // (60 s/min) * (30 min) = 1800 s
},
contentSecurityPolicy: {
'default-src': "'none'",