Merge remote-tracking branch 'origin/develop' 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/d016990d Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d016990d Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d016990d Branch: refs/heads/develop Commit: d016990d8251f596127aef3c41f5049183583272 Parents: 3a94a74 a38ded0 Author: scnakandala <[email protected]> Authored: Mon Aug 8 17:34:44 2016 -0400 Committer: scnakandala <[email protected]> Committed: Mon Aug 8 17:34:44 2016 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 18 +++++- app/libraries/AdminUtilities.php | 9 ++- app/views/account/dashboard.blade.php | 93 ++++++++++++++++++++++++--- app/views/admin/manage-gateway.blade.php | 14 ++-- 4 files changed, 114 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
