[03/39] updating portal with latest code base

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/users/users-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/users/users-controller.js b/portal/js/users/users-controller.js
index 46c4bb4..0a15ad6 100644
--- a/portal/js/users/users-controller.js
+++ b/portal/js/users/users-controller.js
@@ -35,11 +35,11 @@ AppServices.Controllers.controller('UsersCtrl', ['ug', '$scope', '$rootScope', '
     $scope.newUserDialog = function (modalId) {
       //todo: put more validate here
       switch(true){
-        case $scope.newUser.password !== $scope.newUser.repassword :
+        case $scope.newUser.newpassword !== $scope.newUser.repassword :
           $rootScope.$broadcast("alert", "error", "Passwords do not match.");
           break;
         default:
-          ug.createUser($scope.newUser.username, $scope.newUser.name, $scope.newUser.email, $scope.newUser.password);
+          ug.createUser($scope.newUser.newusername, $scope.newUser.name, $scope.newUser.email, $scope.newUser.newpassword);
           $scope.hideModal(modalId);
           clearNewUserForm();
           break;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/users/users-profile-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/users/users-profile-controller.js b/portal/js/users/users-profile-controller.js
index 243c535..8eeeccf 100644
--- a/portal/js/users/users-profile-controller.js
+++ b/portal/js/users/users-profile-controller.js
@@ -4,7 +4,7 @@ AppServices.Controllers.controller('UsersProfileCtrl', ['ug', '$scope', '$rootSc
   function (ug, $scope, $rootScope, $location) {
 
     $scope.user = $rootScope.selectedUser._data.clone();
-    $scope.user.json = $scope.user.json || $rootScope.selectedUser._json;
+    $scope.user.json = $scope.user.json || $scope.user.stringifyJSON();
     $scope.profileSelected = 'active';
 
     if (!$rootScope.selectedUser) {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/users/users.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users.html b/portal/js/users/users.html
index 7deddaf..ad53edc 100644
--- a/portal/js/users/users.html
+++ b/portal/js/users/users.html
@@ -1,15 +1,6 @@
 <div class="content-page">
 
-  <section class="row-fluid">
-
-    <div class="span12">
-      <div class="page-filters">
-        <h1 class="title pull-left"><i class="pictogram title">&#128100;</i> Users</h1>
-      </div>
-    </div>
-
-  </section>
-
+  <page-title title=" Users" icon="&#128100;"></page-title>
   <bsmodal id="newUser"
            title="Create New User"
            close="hideModal"
@@ -23,7 +14,7 @@
         <label for="new-user-username">Username</label>
 
         <div class="controls">
-          <input type="text" required ng-model="$parent.newUser.username" ng-pattern="usernameRegex" ng-attr-title="{{usernameRegexDescription}}"  name="username" id="new-user-username" class="input-xlarge" ug-validate/>
+          <input type="text" required ng-model="$parent.newUser.newusername" ng-pattern="usernameRegex" ng-attr-title="{{usernameRegexDescription}}"  name="username" id="new-user-username" class="input-xlarge" ug-validate/>
           <p class="help-block hide"></p>
         </div>
       </div>
@@ -49,7 +40,7 @@
         <label for="new-user-password">Password</label>
 
         <div class="controls">
-          <input type="password" required ng-pattern="passwordRegex"  ng-attr-title="{{passwordRegexDescription}}" ng-model="$parent.newUser.password" name="password" id="new-user-password" ug-validate
+          <input type="password" required ng-pattern="passwordRegex"  ng-attr-title="{{passwordRegexDescription}}" ng-model="$parent.newUser.newpassword" name="password" id="new-user-password" ug-validate
                  class="input-xlarge"/>
 
           <p class="help-block hide"></p>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index bd3d55c..e750341 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apigee-usergrid",
-  "version": "2.0.19",
+  "version": "2.0.34",
   "packageName": "appsvc-ui",
   "description": "full apigee portal",
   "main": "./scripts/web-server.js",
@@ -29,18 +29,15 @@
     "karma-phantomjs-launcher": "~0.1.1",
     "karma": "~0.10.8",
     "grunt-karma": "~0.6.2",
-    "protractor": "~0.14.0",
+    "protractor": "~0.18.1",
     "grunt-protractor-runner": "~0.2.0",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-compress": "~0.5.3",
     "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-jshint": "~0.7.2",
-    "grunt-istanbul": "~0.2.3",
-    "grunt-complexity": "~0.1.3",
-    "grunt-istanbul-coverage": "0.0.2",
     "grunt-dom-munger": "~3.1.0",
     "bower": "~1.2.8",
-    "grunt-bower-task": "~0.3.4"
+    "grunt-bower-task": "~0.3.4",
+    "grunt-s3": "~0.2.0-alpha.3"
   },
   "engines": {
     "node": ">=0.10.21"