update merge from master

2015-07-13 16:32:03 -08:00 · 2015-07-13 16:32:03 -08:00 · f295082592
commit f295082592
parent 8ab97c00e1 8bdc31f99e
88 changed files with 771 additions and 675 deletions
--- a/config/environment.js
+++ b/config/environment.js
@ -16,8 +16,10 @@ module.exports = function(environment) {
    },
    podModulePrefix: 'clostridiumdotinfo/pods',
    'simple-auth': {
+      session: 'session:custom',
      authorizer: 'simple-auth-authorizer:token',
      store: 'simple-auth-session-store:local-storage',
+      routeAfterAuthentication: 'protected.index',
    },
    'simple-auth-token': {
      identificationField: 'email',