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/2d61412b Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2d61412b Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2d61412b Branch: refs/heads/master Commit: 2d61412bdf78ab007753f1f47c81d81c850b9a80 Parents: f509218 2ddf2db Author: Nipurn Doshi <[email protected]> Authored: Fri Apr 15 15:33:30 2016 -0400 Committer: Nipurn Doshi <[email protected]> Committed: Fri Apr 15 15:33:30 2016 -0400 ---------------------------------------------------------------------- app/controllers/AccountController.php | 26 ++---- .../Stubs/UserInformationRecoveryManager.php | 65 ++++++++++++++- app/libraries/Wsis/Wsis.php | 4 +- app/views/account/create.blade.php | 84 ++++++++++---------- 4 files changed, 116 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
