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/79ff06b5 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/79ff06b5 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/79ff06b5 Branch: refs/heads/develop Commit: 79ff06b573efdf30e2a573b4793e56485d1004d8 Parents: 4c34f89 c4b00f7 Author: Nipurn Doshi <[email protected]> Authored: Tue Dec 27 00:10:03 2016 -0800 Committer: Nipurn Doshi <[email protected]> Committed: Tue Dec 27 00:10:03 2016 -0800 ---------------------------------------------------------------------- app/controllers/AccountController.php | 6 +- app/controllers/AdminController.php | 22 +- app/controllers/ExperimentController.php | 6 +- app/libraries/AdminUtilities.php | 18 +- app/libraries/Airavata/API/Airavata.php | 252 ++++++++++++++----- .../Airavata/Model/Credential/Store/Types.php | 76 ++++-- app/libraries/ExperimentUtilities.php | 5 + app/libraries/URPUtilities.php | 3 +- app/libraries/Wsis/Wsis.php | 21 +- app/views/account/dashboard.blade.php | 35 ++- app/views/admin/experiment-statistics.blade.php | 8 +- app/views/admin/manage-experiments.blade.php | 220 +++++++++++++--- app/views/admin/manage-users.blade.php | 51 ++-- app/views/experiment/create.blade.php | 2 +- app/views/experiment/summary.blade.php | 163 ++++++------ app/views/partials/experiment-info.blade.php | 81 +++--- 16 files changed, 683 insertions(+), 286 deletions(-) ----------------------------------------------------------------------
