merging seagrid
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/e13a01a0 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e13a01a0 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e13a01a0 Branch: refs/heads/develop Commit: e13a01a06d281a0f55094f5589733e99427229de Parents: f78db58 3d591e2 Author: scnakandala <[email protected]> Authored: Mon Jul 11 14:55:04 2016 -0400 Committer: scnakandala <[email protected]> Committed: Mon Jul 11 14:55:04 2016 -0400 ---------------------------------------------------------------------- app/config/pga_config_default_template.php | 243 + app/controllers/AccountController.php | 32 +- app/controllers/AdminController.php | 25 +- app/controllers/ComputeResourceController.php | 4 + app/libraries/Airavata/API/Airavata.php | 11419 ++++++++--------- app/libraries/Airavata/Model/User/Types.php | 109 +- .../Airavata/Model/Workspace/Types.php | 339 +- app/libraries/CRUtilities.php | 12 + app/libraries/CommonUtilities.php | 2 + app/views/account/dashboard.blade.php | 72 +- app/views/admin/manage-gateway.blade.php | 43 +- app/views/home.blade.php | 2 +- app/views/layout/basic.blade.php | 16 +- app/views/partials/add-gateway-block.blade.php | 40 + 14 files changed, 5729 insertions(+), 6629 deletions(-) ----------------------------------------------------------------------
