Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4690F200C28 for ; Mon, 13 Feb 2017 01:28:55 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 41F09160B70; Mon, 13 Feb 2017 00:28:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B088C160B6B for ; Mon, 13 Feb 2017 01:28:54 +0100 (CET) Received: (qmail 45809 invoked by uid 500); 13 Feb 2017 00:28:53 -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 45791 invoked by uid 99); 13 Feb 2017 00:28:53 -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; Mon, 13 Feb 2017 00:28:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3213EDFAB2; Mon, 13 Feb 2017 00:28:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ndoshi@apache.org To: commits@airavata.apache.org Date: Mon, 13 Feb 2017 00:28:54 -0000 Message-Id: <0eb7653aa85c446c9305b934fb847086@git.apache.org> In-Reply-To: <6c66415f408f49eaba40a06f3db3e92b@git.apache.org> References: <6c66415f408f49eaba40a06f3db3e92b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop archived-at: Mon, 13 Feb 2017 00:28:55 -0000 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/f199d9b8 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f199d9b8 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f199d9b8 Branch: refs/heads/develop Commit: f199d9b8b8c87117e6c8f457836167e20ab6b046 Parents: db5eba4 9765c1e Author: Nipurn Doshi Authored: Sun Feb 12 16:28:14 2017 -0800 Committer: Nipurn Doshi Committed: Sun Feb 12 16:28:14 2017 -0800 ---------------------------------------------------------------------- app/config/pga_config.php.template | 8 +++ app/controllers/AccountController.php | 24 +++++-- app/controllers/AdminController.php | 65 ++++++++++-------- app/controllers/ExperimentController.php | 6 +- app/libraries/CommonUtilities.php | 4 ++ app/views/account/dashboard.blade.php | 5 ++ app/views/admin/manage-gateway.blade.php | 70 +++++++++----------- .../compute-resource-preferences.blade.php | 2 +- app/views/storage-resource/edit.blade.php | 1 + 9 files changed, 113 insertions(+), 72 deletions(-) ----------------------------------------------------------------------