Merge remote-tracking branch 'origin/develop' 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/5337dd32 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5337dd32 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5337dd32 Branch: refs/heads/develop Commit: 5337dd3225d44926692f167f1949626790421595 Parents: 6e674f5 06f8220 Author: scnakandala <[email protected]> Authored: Tue Apr 19 12:24:03 2016 -0400 Committer: scnakandala <[email protected]> Committed: Tue Apr 19 12:24:03 2016 -0400 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 29 +++++------ app/libraries/ExperimentUtilities.php | 55 +++++++++++--------- app/libraries/ProjectUtilities.php | 4 +- app/views/experiment/edit.blade.php | 6 ++- app/views/partials/experiment-info.blade.php | 6 +-- app/views/partials/experiment-inputs.blade.php | 12 +++-- .../partials/experiment-queue-block.blade.php | 10 ++-- app/views/project/summary.blade.php | 2 +- 8 files changed, 68 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
