Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
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/cb0e4556 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/cb0e4556 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/cb0e4556 Branch: refs/heads/master Commit: cb0e45563889fd2693977b98554643da1a04fc58 Parents: 9f8414a 365974e Author: Nipurn Doshi <[email protected]> Authored: Thu Oct 8 16:14:31 2015 -0400 Committer: Nipurn Doshi <[email protected]> Committed: Thu Oct 8 16:14:31 2015 -0400 ---------------------------------------------------------------------- app/config/pga_config.php.template | 7 +- app/controllers/AccountController.php | 4 +- app/libraries/Airavata/API/Airavata.php | 8719 +++++++++++------- .../Model/AppCatalog/ComputeResource/Types.php | 196 +- .../Model/AppCatalog/GatewayProfile/Types.php | 257 +- .../Airavata/Model/Scheduling/Types.php | 23 + app/libraries/Airavata/Model/Status/Types.php | 46 +- app/libraries/ExperimentUtilities.php | 44 +- app/views/partials/experiment-inputs.blade.php | 7 +- .../partials/experiment-queue-block.blade.php | 7 + .../partials/gateway-preferences.blade.php | 9 + app/views/project/summary.blade.php | 12 +- 12 files changed, 5823 insertions(+), 3508 deletions(-) ----------------------------------------------------------------------
