Merge userManagement branch to master

LesionTracker/.meteor/packages

@@ -49,3 +49,4 @@ clinical:hipaa-logger
 anti:gagarin@=0.4.11
 check
 aldeed:template-extension@4.0.0
+zuuk:stale-session

LesionTracker/.meteor/versions

@@ -17,10 +17,10 @@ caching-compiler@1.0.0
 caching-html-compiler@1.0.2
 callback-hook@1.0.4
 check@1.1.0
-clinical:active-entry@1.5.14
+clinical:active-entry@1.5.16
 clinical:auto-resizing@0.1.2
 clinical:error-pages@0.1.1
-clinical:extended-api@2.2.1
+clinical:extended-api@2.2.2
 clinical:fonts@1.0.0
 clinical:hipaa-audit-log@2.4.2
 clinical:hipaa-logger@1.0.1
@@ -28,7 +28,7 @@ clinical:router@2.0.17
 clinical:router-location@2.0.14
 clinical:router-middleware-stack@2.0.13
 clinical:router-url@2.0.15
-clinical:theming@0.3.1
+clinical:theming@0.4.7
 coffeescript@1.0.11
 cornerstone@0.0.1
 ddp@1.2.2
@@ -46,7 +46,7 @@ ejson@1.0.7
 email@1.0.8
 es5-shim@4.1.14
 fastclick@1.0.7
-fortawesome:fontawesome@4.4.0
+fortawesome:fontawesome@4.5.0
 geojson-utils@1.0.4
 grove:less@0.1.1
 hangingprotocols@0.0.1
@@ -54,7 +54,7 @@ hot-code-push@1.0.0
 html-tools@1.0.5
 htmljs@1.0.5
 http@1.1.1
-ian:accounts-ui-bootstrap-3@1.2.83
+ian:accounts-ui-bootstrap-3@1.2.89
 id-map@1.0.4
 insecure@1.0.4
 iron:controller@1.0.12
@@ -74,7 +74,7 @@ minifiers@1.1.7
 minimongo@1.0.10
 mobile-experience@1.0.1
 mobile-status-bar@1.0.6
-momentjs:moment@2.10.6
+momentjs:moment@2.11.2
 mongo@1.1.3
 mongo-id@1.0.1
 mrt:moment@2.8.1
@@ -82,8 +82,8 @@ npm-bcrypt@0.7.8_2
 npm-mongo@1.4.39_1
 observe-sequence@1.0.7
 ordered-dict@1.0.4
-practicalmeteor:chai@1.9.2_3
-practicalmeteor:loglevel@1.1.0_3
+practicalmeteor:chai@2.1.0_1
+practicalmeteor:loglevel@1.2.0_2
 promise@0.5.1
 random@1.0.5
 rate-limit@1.0.0
@@ -105,7 +105,7 @@ stylus@2.511.1
 templating@1.1.5
 templating-tools@1.0.0
 tracker@1.0.9
-twbs:bootstrap@3.3.5
+twbs:bootstrap@3.3.6
 ui@1.0.8
 underscore@1.0.4
 url@1.0.5
@@ -113,3 +113,4 @@ viewerbase@0.0.1
 webapp@1.2.3
 webapp-hashing@1.0.5
 worklist@0.0.1
+zuuk:stale-session@1.0.8

LesionTracker/activeEntry.js

@@ -12,8 +12,16 @@ if (Meteor.isClient){
             destination: '/worklist'
         },
         themeColors: {
-            primary: 'black'
+            primary: ""
+        },
+        passwordOptions: {
+            showPasswordStrengthIndicator: false,
+            requireRegexValidation: true,
+            //requireStrongPasswords: false
+            passwordHistoryCount: 6,
+            failedAttemptsLimit: 5
         }
+
     });
 }
 

LesionTracker/client/routes.js

@@ -30,11 +30,21 @@ var routerOptions = {
 };
 
 Router.route('/', function() {
-    this.render('worklist', routerOptions);
+    // Check user is logged in
+    if (!Meteor.user() || !Meteor.userId()) {
+        this.render('entrySignIn', routerOptions);
+    } else{
+        this.render('worklist', routerOptions);
+    }
 });
 
 Router.route('/worklist', function() {
-    this.render('worklist', routerOptions);
+    // Check user is logged in
+    if (!Meteor.user() || !Meteor.userId()) {
+        this.render('entrySignIn', routerOptions);
+    } else{
+        this.render('worklist', routerOptions);
+    }
 });
 
 Router.route('/viewer/timepoints/:_id', {