Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5100F18BC9 for ; Thu, 17 Mar 2016 16:38:37 +0000 (UTC) Received: (qmail 34770 invoked by uid 500); 17 Mar 2016 16:38:37 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 34670 invoked by uid 500); 17 Mar 2016 16:38:37 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 34552 invoked by uid 99); 17 Mar 2016 16:38:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Mar 2016 16:38:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AC803DFFAB; Thu, 17 Mar 2016 16:38:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Thu, 17 Mar 2016 16:38:39 -0000 Message-Id: <0a91bc0e990a4df884644fea293d10f5@git.apache.org> In-Reply-To: <40fc96a75037481d8d7788937e95e2f6@git.apache.org> References: <40fc96a75037481d8d7788937e95e2f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/11] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/492b8218 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/492b8218 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/492b8218 Branch: refs/heads/master Commit: 492b82187a965a2b50b123852d8988e8e3b63666 Parents: 0cec2b4 44539fc Author: Nipurn Doshi Authored: Wed Mar 16 15:32:57 2016 -0400 Committer: Nipurn Doshi Committed: Wed Mar 16 15:32:57 2016 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 16 ++++-- app/libraries/ExperimentUtilities.php | 2 +- app/libraries/Wsis/Stubs/UserStoreManager.php | 18 +++++-- app/views/admin/manage-users.blade.php | 62 +++++++++++----------- 4 files changed, 57 insertions(+), 41 deletions(-) ----------------------------------------------------------------------