Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway 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/e338c824 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e338c824 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e338c824 Branch: refs/heads/develop Commit: e338c824b28074fea66bbe746cba8b3c62215590 Parents: 0a125c1 7a7e2f9 Author: Nipurn Doshi <[email protected]> Authored: Thu May 18 18:30:25 2017 -0700 Committer: Nipurn Doshi <[email protected]> Committed: Thu May 18 18:30:25 2017 -0700 ---------------------------------------------------------------------- app/controllers/AdminController.php | 2 +- app/controllers/ComputeResourceController.php | 4 + app/controllers/ExperimentController.php | 128 +- app/controllers/GatewayController.php | 40 - app/controllers/ProjectController.php | 8 +- app/libraries/Airavata/API/Airavata.php | 11335 ++++++++++------- app/libraries/Airavata/API/Error/Types.php | 82 + .../Model/AppCatalog/AppDeployment/Types.php | 25 +- .../Model/AppCatalog/ComputeResource/Types.php | 94 + .../Airavata/Model/Application/Io/Types.php | 6 +- .../Airavata/Model/Data/Replica/Types.php | 572 +- .../Airavata/Model/Messaging/Event/Types.php | 2 + app/libraries/Airavata/Model/User/Types.php | 279 +- app/libraries/ExperimentUtilities.php | 20 +- app/libraries/ProjectUtilities.php | 13 +- app/libraries/SharingUtilities.php | 21 +- app/resources/security/idp_scigap_org.pem | 156 +- app/routes.php | 2 + app/storage/.gitignore | 0 app/storage/cache/.gitignore | 0 app/storage/logs/.gitignore | 0 app/storage/meta/.gitignore | 0 app/storage/sessions/.gitignore | 0 app/storage/views/.gitignore | 0 app/views/account/dashboard.blade.php | 3 +- app/views/experiment/edit.blade.php | 2 +- app/views/home.blade.php | 2 +- app/views/partials/deployment-block.blade.php | 15 + app/views/partials/experiment-inputs.blade.php | 3 +- .../partials/experiment-queue-block.blade.php | 127 +- app/views/project/create.blade.php | 1 + app/views/resource/edit.blade.php | 20 + app/views/resource/view.blade.php | 20 + public/js/sharing/share.js | 2 +- 34 files changed, 7915 insertions(+), 5069 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e338c824/app/views/home.blade.php ----------------------------------------------------------------------
