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 <[email protected]> Authored: Wed Feb 10 14:30:12 2016 -0500 Committer: Nipurn Doshi <[email protected]> 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(-) ----------------------------------------------------------------------
