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/66c8de25 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/66c8de25 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/66c8de25 Branch: refs/heads/develop Commit: 66c8de25347e423eca1979f09a6cfe1e8b113ad8 Parents: 54bdf95 5146d9b Author: scnakandala <[email protected]> Authored: Fri Jul 29 13:01:42 2016 -0400 Committer: scnakandala <[email protected]> Committed: Fri Jul 29 13:01:42 2016 -0400 ---------------------------------------------------------------------- app/views/account/dashboard.blade.php | 27 ++++- app/views/admin/manage-gateway.blade.php | 160 ++++++++++++++++---------- 2 files changed, 123 insertions(+), 64 deletions(-) ----------------------------------------------------------------------
