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/492b8218 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/492b8218 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/492b8218 Branch: refs/heads/develop Commit: 492b82187a965a2b50b123852d8988e8e3b63666 Parents: 0cec2b4 44539fc Author: Nipurn Doshi <nipunh...@gmail.com> Authored: Wed Mar 16 15:32:57 2016 -0400 Committer: Nipurn Doshi <nipunh...@gmail.com> Committed: Wed Mar 16 15:32:57 2016 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 16 ++++-- app/libraries/ExperimentUtilities.php | 2 +- app/libraries/Wsis/Stubs/UserStoreManager.php | 18 +++++-- app/views/admin/manage-users.blade.php | 62 +++++++++++----------- 4 files changed, 57 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
