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/4ea219d8 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/4ea219d8 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/4ea219d8 Branch: refs/heads/master Commit: 4ea219d809d7a657c0854233555464b346ffcd93 Parents: a41fa62 fd9369e Author: Nipurn Doshi <[email protected]> Authored: Fri Mar 11 13:34:51 2016 -0500 Committer: Nipurn Doshi <[email protected]> Committed: Fri Mar 11 13:34:51 2016 -0500 ---------------------------------------------------------------------- app/config/pga_config.php.template | 6 +- app/controllers/AccountController.php | 38 +- app/libraries/Airavata/API/Airavata.php | 387 +++++++++++++++++++ .../Model/AppCatalog/GatewayProfile/Types.php | 23 ++ .../Stubs/UserInformationRecoveryManager.php | 7 +- app/libraries/Wsis/Wsis.php | 4 +- app/views/account/forgot-password.blade.php | 16 +- app/views/account/verify-human.blade.php | 12 +- 8 files changed, 448 insertions(+), 45 deletions(-) ----------------------------------------------------------------------
