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/bcf167a5 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/bcf167a5 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/bcf167a5 Branch: refs/heads/develop Commit: bcf167a5cf3de3edfe40909ee2b8d7556f0a9d6a Parents: 7aca00c 24df8b8 Author: scnakandala <[email protected]> Authored: Tue Mar 1 14:18:26 2016 -0500 Committer: scnakandala <[email protected]> Committed: Tue Mar 1 14:18:26 2016 -0500 ---------------------------------------------------------------------- app/controllers/AccountController.php | 8 + app/controllers/AdminController.php | 4 + app/controllers/ApplicationController.php | 12 +- app/controllers/ComputeResourceController.php | 18 ++ .../Model/AppCatalog/AppDeployment/Types.php | 33 --- .../Model/AppCatalog/ComputeResource/Types.php | 290 +++++++++++++------ .../Model/AppCatalog/GatewayProfile/Types.php | 23 ++ .../Model/AppCatalog/Parallelism/Types.php | 53 ++++ .../Airavata/Model/Experiment/Types.php | 67 +++-- app/libraries/AppUtilities.php | 6 + app/libraries/CRUtilities.php | 14 +- app/routes.php | 7 + app/views/account/dashboard.blade.php | 10 + app/views/account/request-allocation.blade.php | 70 +++++ app/views/admin/manage-gateway.blade.php | 2 +- app/views/application/interface.blade.php | 55 +++- .../compute-resource-preferences.blade.php | 13 + .../partials/resource-job-manager.blade.php | 41 +++ app/views/resource/browse.blade.php | 2 +- app/views/resource/edit.blade.php | 152 ++++------ app/views/storage-resource/browse.blade.php | 2 +- public/css/bootstrap.min.css | 6 +- public/js/interface.js | 10 + public/js/script.js | 18 +- 24 files changed, 676 insertions(+), 240 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bcf167a5/app/controllers/AccountController.php ----------------------------------------------------------------------
