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/6af5d61d Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6af5d61d Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6af5d61d Branch: refs/heads/master Commit: 6af5d61daf8282dda889a97949b22a7a4c9f752e Parents: 84f06e9 cb39e6e Author: scnakandala <[email protected]> Authored: Tue Apr 12 15:37:15 2016 -0400 Committer: scnakandala <[email protected]> Committed: Tue Apr 12 15:37:15 2016 -0400 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 23 +++++++++++++++++---- app/libraries/ProjectUtilities.php | 4 ++-- app/views/admin/manage-experiments.blade.php | 8 ++++--- app/views/admin/manage-gateway.blade.php | 4 +--- app/views/application/module.blade.php | 2 +- app/views/experiment/create-complete.blade.php | 2 +- app/views/experiment/edit.blade.php | 2 +- app/views/partials/experiment-inputs.blade.php | 15 +++----------- public/js/gateway.js | 2 +- public/js/interface.js | 2 +- 10 files changed, 35 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
