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/f072341a Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f072341a Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f072341a Branch: refs/heads/develop Commit: f072341a10b78757e9397cc3a038390433152057 Parents: ba6381d e4e613f Author: scnakandala <[email protected]> Authored: Tue Nov 24 18:30:04 2015 -0500 Committer: scnakandala <[email protected]> Committed: Tue Nov 24 18:30:04 2015 -0500 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 5 +- app/controllers/ResourceController.php | 2 +- app/controllers/StorageresourceController.php | 71 +- app/libraries/Airavata/API/Airavata.php | 420 +++++---- .../Model/AppCatalog/ComputeResource/Types.php | 943 +++---------------- .../Model/AppCatalog/StorageResource/Types.php | 6 +- .../Airavata/Model/Experiment/Types.php | 23 + app/libraries/Airavata/Model/Process/Types.php | 23 + app/libraries/ExperimentUtilities.php | 114 ++- app/libraries/SRUtilities.php | 223 +---- app/views/layout/fixed-scripts.blade.php | 2 + app/views/partials/dashboard-block.blade.php | 4 +- app/views/partials/experiment-info.blade.php | 135 ++- app/views/partials/experiment-inputs.blade.php | 2 +- app/views/resource/edit.blade.php | 25 +- app/views/storage-resource/browse.blade.php | 16 +- app/views/storage-resource/edit.blade.php | 706 +++----------- 17 files changed, 867 insertions(+), 1853 deletions(-) ----------------------------------------------------------------------
