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/d8cb5603 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d8cb5603 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d8cb5603 Branch: refs/heads/develop Commit: d8cb5603c9eb452038a99d521992f981ffc209ea Parents: 5edae07 2f41e27 Author: Nipurn Doshi <[email protected]> Authored: Sat May 27 18:43:29 2017 -0700 Committer: Nipurn Doshi <[email protected]> Committed: Sat May 27 18:43:29 2017 -0700 ---------------------------------------------------------------------- app/controllers/ComputeResourceController.php | 28 ++++- app/controllers/ExperimentController.php | 109 ++++++++----------- .../Model/AppCatalog/ComputeResource/Types.php | 48 +++++++- app/libraries/AppUtilities.php | 5 +- app/views/application/deployment.blade.php | 4 +- app/views/experiment/create-complete.blade.php | 2 + app/views/experiment/edit.blade.php | 2 + app/views/partials/deployment-block.blade.php | 28 ++++- .../partials/experiment-queue-block.blade.php | 98 ++++++++++++----- app/views/partials/queue-block.blade.php | 36 ++++++ app/views/resource/edit.blade.php | 40 +++---- app/views/resource/view.blade.php | 40 +++---- public/js/deployment.js | 22 ++++ 13 files changed, 316 insertions(+), 146 deletions(-) ----------------------------------------------------------------------
