You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2015/04/25 18:33:20 UTC
[2/2] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into admin
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into admin
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/a6c6a3ce
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a6c6a3ce
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a6c6a3ce
Branch: refs/heads/master
Commit: a6c6a3ced810eabd9456652a00921b1f08deddc0
Parents: f730ac6 f02b58e
Author: Suresh Marru <sm...@apache.org>
Authored: Sat Apr 25 12:32:53 2015 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sat Apr 25 12:32:53 2015 -0400
----------------------------------------------------------------------
app/controllers/ComputeResource.php | 2 +-
app/controllers/ExperimentController.php | 38 ++++---
app/libraries/CRUtilities.php | 10 +-
app/libraries/utilities.php | 25 ++---
app/routes.php | 4 +
app/views/admin/manage-experiments.blade.php | 38 ++++++-
app/views/experiment/create-complete.blade.php | 2 +-
app/views/experiment/summary.blade.php | 114 +-------------------
app/views/partials/experiment-info.blade.php | 114 ++++++++++++++++++++
app/views/partials/experiment-inputs.blade.php | 9 ++
app/views/resource/edit.blade.php | 34 ++++--
public/assets/ajax-loader.gif | Bin 0 -> 3208 bytes
12 files changed, 236 insertions(+), 154 deletions(-)
----------------------------------------------------------------------