Merge branch 'master' of https://github.com/techx/quill

README.md

@@ -59,10 +59,11 @@ On the Settings tab, admins can easily control their event application timeline
 
 # Setup
 
-Getting a local instance of Quill up and running takes less than 5 minutes! Start by setting up the database:
+Getting a local instance of Quill up and running takes less than 5 minutes! Start by setting up the database. Ideally, you should run MongoDB as a daemon with a secure configuration (with most linux distributions, you should be able to install it with your package manager, and it'll be set up as a daemon). Although not recommended for production, when running locally for development, you could do it like this
+
 ```
 mkdir db
-mongod --dbpath db
+mongod --dbpath db --bind_ip 127.0.0.1 --nohttpinterface
 ```
 
 Install the necessary dependencies:

app/client/views/admin/users/adminUsersCtrl.js

@@ -208,7 +208,7 @@ angular.module('reg')
             fields: [
               {
                 name: 'Phone Number',
-                value: user.confirmation.phone
+                value: user.confirmation.phoneNumber
               },{
                 name: 'Dietary Restrictions',
                 value: user.confirmation.dietaryRestrictions.join(', ')

app/client/views/team/teamCtrl.js

@@ -16,7 +16,7 @@ angular.module('reg')
 
       $scope.TEAM = TEAM;
 
-      if ($scope.user.teamCode){
+      function _populateTeammates() {
         UserService
           .getMyTeammates()
           .success(function(users){
@@ -25,6 +25,10 @@ angular.module('reg')
           });
       }
 
+      if ($scope.user.teamCode){
+        _populateTeammates();
+      }
+
       $scope.joinTeam = function(){
         UserService
           .joinOrCreateTeam($scope.code)