Merge remote-tracking branch 'sneha/2233' into develop This closes #63
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/8fefd013 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/8fefd013 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/8fefd013 Branch: refs/heads/dreg-gateway Commit: 8fefd0132848fec7527c7e3ca45fb42302bcab88 Parents: 06544a1 1b3afd1 Author: Marcus Christie <machr...@iu.edu> Authored: Tue Jul 4 11:46:23 2017 -0400 Committer: Marcus Christie <machr...@iu.edu> Committed: Tue Jul 4 11:46:23 2017 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 10 ++++++--- .../GatewayRequestUpdateController.php | 2 +- app/libraries/AdminUtilities.php | 3 +++ app/routes.php | 4 ++-- app/views/admin/manage-gateway.blade.php | 22 +++++++++++++++----- 5 files changed, 30 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/8fefd013/app/controllers/AdminController.php ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/8fefd013/app/libraries/AdminUtilities.php ----------------------------------------------------------------------
