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 E395C181E0 for ; Wed, 10 Feb 2016 19:31:29 +0000 (UTC) Received: (qmail 93390 invoked by uid 500); 10 Feb 2016 19:31:29 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 93311 invoked by uid 500); 10 Feb 2016 19:31:29 -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 93181 invoked by uid 99); 10 Feb 2016 19:31:29 -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; Wed, 10 Feb 2016 19:31:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A2EA2E0534; Wed, 10 Feb 2016 19:31:29 +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: Wed, 10 Feb 2016 19:31:31 -0000 Message-Id: <8ada7e824b22452fbd47f1637e9598ed@git.apache.org> In-Reply-To: <827519b5a7154e61a0792c6af23057ca@git.apache.org> References: <827519b5a7154e61a0792c6af23057ca@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/b5720467 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b5720467 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b5720467 Branch: refs/heads/develop Commit: b57204671b6deec8532c361d20e33eb80cc8081f Parents: e0195ad 667d071 Author: Nipurn Doshi Authored: Wed Feb 10 14:30:12 2016 -0500 Committer: Nipurn Doshi Committed: Wed Feb 10 14:30:12 2016 -0500 ---------------------------------------------------------------------- app/config/pga_config.php.template | 15 ++++------- app/controllers/AccountController.php | 28 +++++++++++++++----- app/libraries/Wsis/Stubs/OAuthManager.php | 4 ++- app/routes.php | 2 ++ app/views/account/verify-human.blade.php | 36 ++++++++++++++++++++++++++ 5 files changed, 67 insertions(+), 18 deletions(-) ----------------------------------------------------------------------