Merge branch 'user_list_enhancement' of https://github.com/stephenpaul2727/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/702abd76 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/702abd76 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/702abd76 Branch: refs/heads/develop Commit: 702abd7664426bdcc365c19309d1e6b1921964b7 Parents: 5276a78 f48ea90 Author: Marcus Christie <[email protected]> Authored: Mon Oct 16 14:35:17 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Mon Oct 16 14:35:17 2017 -0400 ---------------------------------------------------------------------- app/libraries/IamAdminServicesUtilities.php | 2 +- app/libraries/Keycloak/Keycloak.php | 3 ++- app/views/admin/manage-users.blade.php | 13 ++++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/702abd76/app/libraries/Keycloak/Keycloak.php ----------------------------------------------------------------------
