Merge branch 'heads/sneha/develop' into develop This closes #58
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/1281d827 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1281d827 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1281d827 Branch: refs/heads/develop Commit: 1281d8277d066b83bb997f564513d4c39e1e96f3 Parents: acda62e a5d1637 Author: Marcus Christie <[email protected]> Authored: Sat Jul 1 20:45:53 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Sat Jul 1 20:45:53 2017 -0400 ---------------------------------------------------------------------- app/config/email_templates.json | 50 ++++ app/controllers/AdminController.php | 118 +++++++--- .../GatewayRequestUpdateController.php | 70 ++++++ app/libraries/AdminUtilities.php | 132 ++++++++--- app/libraries/Airavata/Model/Tenant/Types.php | 2 + .../Airavata/Model/Workspace/Types.php | 2 + app/libraries/CRUtilities.php | 6 +- app/libraries/CommonUtilities.php | 11 +- app/libraries/EmailUtilities.php | 46 ++++ app/routes.php | 11 +- app/views/account/dashboard.blade.php | 74 +++--- app/views/account/settings.blade.php | 2 + app/views/account/update.blade.php | 153 +++++++++++++ app/views/admin/create-gateway.blade.php | 148 ++++++++++++ app/views/admin/manage-gateway.blade.php | 227 ++++++++++++++----- 15 files changed, 880 insertions(+), 172 deletions(-) ----------------------------------------------------------------------
