Return-Path: 
 <commits-return-2485-apmail-usergrid-commits-archive=usergrid.apache.org@usergrid.incubator.apache.org>
X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org
Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3343810B98
	for <apmail-usergrid-commits-archive@minotaur.apache.org>;
 Thu,  6 Mar 2014 22:23:03 +0000 (UTC)
Received: (qmail 72243 invoked by uid 500); 6 Mar 2014 22:22:57 -0000
Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org
Received: (qmail 71880 invoked by uid 500); 6 Mar 2014 22:22:49 -0000
Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@usergrid.incubator.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@usergrid.incubator.apache.org>
List-Post: <mailto:commits@usergrid.incubator.apache.org>
List-Id: <commits.usergrid.incubator.apache.org>
Reply-To: dev@usergrid.incubator.apache.org
Delivered-To: mailing list commits@usergrid.incubator.apache.org
Received: (qmail 71801 invoked by uid 99); 6 Mar 2014 22:22:47 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2014 22:22:47 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id BBF5B93FEF0; Thu,  6 Mar 2014 22:22:46 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: snoopdave@apache.org
To: commits@usergrid.apache.org
Date: Thu, 06 Mar 2014 22:22:48 -0000
Message-Id: <27a35ffcc35f42c78da8aba777e6344b@git.apache.org>
In-Reply-To: <dd3d7fe614804594b961975e79362976@git.apache.org>
References: <dd3d7fe614804594b961975e79362976@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [03/28] USERGRID-86: Remove restriction on 10 apps in the portal

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf075e6c/portal/js/users/users-feed-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/users/users-feed-controller.js b/portal/js/users/users-feed-controller.js
new file mode 100644
index 0000000..1f1c4a5
--- /dev/null
+++ b/portal/js/users/users-feed-controller.js
@@ -0,0 +1,29 @@
+'use strict'
+
+AppServices.Controllers.controller('UsersFeedCtrl', ['ug', '$scope', '$rootScope', '$location',
+  function (ug, $scope, $rootScope, $location) {
+
+    $scope.activitiesSelected = 'active';
+    $scope.activityToAdd = '';
+    $scope.activities = [];
+    $scope.newActivity = {};
+    var getFeed = function(){
+      ug.getEntityActivities($rootScope.selectedUser,true);
+    };
+
+    if (!$rootScope.selectedUser) {
+      $location.path('/users');
+      return;
+    } else {
+      getFeed();
+    }
+
+    $scope.$on('users-feed-error',function(){
+      $rootScope.$broadcast('alert', 'error', 'could not create activity');
+    });
+    $scope.$on('users-feed-received',function(evt,entities){
+      $scope.activities = entities;
+      $scope.applyScope();
+    });
+
+  }]);

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf075e6c/portal/js/users/users-feed.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-feed.html b/portal/js/users/users-feed.html
new file mode 100644
index 0000000..5968746
--- /dev/null
+++ b/portal/js/users/users-feed.html
@@ -0,0 +1,27 @@
+<div class="content-page" ng-controller="UsersFeedCtrl" >
+
+    <div ng:include="'users/users-tabs.html'"></div>
+    <br>
+    <div>
+        <table class="table table-striped">
+            <tbody>
+            <tr class="table-header">
+                <td>Date</td>
+                <td>User</td>
+                <td>Content</td>
+                <td>Verb</td>
+                <td>UUID</td>
+            </tr>
+            <tr class="zebraRows" ng-repeat="activity in activities">
+                <td>{{activity.createdDate}}</td>
+                <td>{{activity.actor.displayName}}</td>
+                <td>{{activity.content}}</td>
+                <td>{{activity.verb}}</td>
+                <td>{{activity.uuid}}</td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+
+
+</div>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf075e6c/portal/js/users/users.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users.html b/portal/js/users/users.html
index ad53edc..6078c82 100644
--- a/portal/js/users/users.html
+++ b/portal/js/users/users.html
@@ -107,6 +107,7 @@
           <li class="tab" ng-class="currentUsersPage.route === '/users/profile' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/profile')"><i class="pictogram">&#59170;</i>Profile</a></li>
           <li class="tab" ng-class="currentUsersPage.route === '/users/groups' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/groups')"><i class="pictogram">&#128101;</i>Groups</a></li>
           <li class="tab" ng-class="currentUsersPage.route === '/users/activities' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/activities')"><i class="pictogram">&#59194;</i>Activities</a></li>
+          <li class="tab" ng-class="currentUsersPage.route === '/users/feed' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/feed')"><i class="pictogram">&#128196;</i>Feed</a></li>
           <li class="tab" ng-class="currentUsersPage.route === '/users/graph' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/graph')"><i class="pictogram">&#9729;</i>Graph</a></li>
           <li class="tab" ng-class="currentUsersPage.route === '/users/roles' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/roles')"><i class="pictogram">&#127758;</i>Roles &amp; Permissions</a></li>
         </ul>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf075e6c/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index ca5b409..a54ded3 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apigee-usergrid",
-  "version": "2.0.34",
+  "version": "2.0.36",
   "packageName": "appsvc-ui",
   "description": "full apigee portal",
   "main": "./scripts/web-server.js",
@@ -36,7 +36,8 @@
     "grunt-contrib-clean": "~0.5.0",
     "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"