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/dea0686d Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/dea0686d Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/dea0686d Branch: refs/heads/develop Commit: dea0686dc839b90e98266c0cac2a0f97f50aa4f7 Parents: 1d24fee eed3374 Author: scnakandala <[email protected]> Authored: Wed Aug 10 12:59:19 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Aug 10 12:59:19 2016 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 30 ++++---- app/libraries/AdminUtilities.php | 34 ++++++++- app/libraries/CRUtilities.php | 16 +++-- app/views/account/dashboard.blade.php | 19 +++-- app/views/admin/manage-gateway.blade.php | 100 ++++++++++++++++++++++---- 5 files changed, 157 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
