Merge remote-tracking branch 'upstream/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/cf2274a7 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/cf2274a7 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/cf2274a7 Branch: refs/heads/dreg-gateway Commit: cf2274a7a4dfe629ba1d75d4fc91a040ca521002 Parents: 315a890 5f30245 Author: Sneha Tilak <tilaks@Snehas-MacBook-Pro.local> Authored: Sun Jul 9 02:06:06 2017 -0400 Committer: Sneha Tilak <tilaks@Snehas-MacBook-Pro.local> Committed: Sun Jul 9 02:06:06 2017 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 3 +++ app/libraries/CommonUtilities.php | 2 +- app/views/admin/manage-users.blade.php | 9 +++++++++ app/views/home.blade.php | 4 ++-- 4 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cf2274a7/app/controllers/AdminController.php ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cf2274a7/app/libraries/CommonUtilities.php ----------------------------------------------------------------------
