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/d8c6e814 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d8c6e814 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d8c6e814 Branch: refs/heads/develop Commit: d8c6e814f3764b125a05003a19f8b796d4929d8a Parents: 62e2abd 26ed2cf Author: Suresh Marru <[email protected]> Authored: Fri Oct 28 10:11:36 2016 -0400 Committer: Suresh Marru <[email protected]> Committed: Fri Oct 28 10:11:36 2016 -0400 ---------------------------------------------------------------------- app/config/pga_config.php.template | 17 +- app/controllers/AccountController.php | 132 +- app/controllers/AdminController.php | 89 +- app/controllers/ExperimentController.php | 180 +- app/controllers/GatewayprofileController.php | 2 +- app/controllers/GroupController.php | 54 + app/controllers/ProjectController.php | 158 +- app/libraries/AdminUtilities.php | 73 +- app/libraries/Airavata/API/Airavata.php | 14612 ++++++++++------- .../Model/AppCatalog/GatewayProfile/Types.php | 92 + .../Airavata/Model/Experiment/Types.php | 205 +- app/libraries/Airavata/Model/Group/Types.php | 235 + app/libraries/Airavata/Model/Job/Types.php | 51 +- .../Airavata/Model/Messaging/Event/Types.php | 124 +- app/libraries/Airavata/Model/Process/Types.php | 200 +- app/libraries/Airavata/Model/Task/Types.php | 122 +- app/libraries/Airavata/Model/User/Types.php | 121 +- .../Airavata/Model/Workspace/Types.php | 318 +- app/libraries/CRUtilities.php | 29 +- app/libraries/CommonUtilities.php | 36 +- app/libraries/ExperimentUtilities.php | 126 +- app/libraries/GrouperUtilities.php | 141 + app/libraries/ProjectUtilities.php | 90 +- app/libraries/SharingUtilities.php | 180 + .../Wsis/Stubs/AuthenticationAdminStub.php | 3 + app/libraries/Wsis/Wsis.php | 31 +- .../assets/Profile_avatar_placeholder_large.png | Bin 0 -> 2011 bytes app/routes.php | 22 +- app/views/account/dashboard.blade.php | 311 +- app/views/admin/manage-credentials.blade.php | 12 +- app/views/admin/manage-experiments.blade.php | 51 +- app/views/admin/manage-gateway.blade.php | 479 +- app/views/admin/manage-notices.blade.php | 2 +- app/views/admin/manage-roles.blade.php | 40 +- app/views/admin/manage-users.blade.php | 143 +- app/views/application/module.blade.php | 4 +- app/views/experiment/create-complete.blade.php | 13 +- app/views/experiment/create.blade.php | 10 +- app/views/experiment/edit.blade.php | 13 +- .../experiment/no-sharing-browse.blade.php | 214 + .../no-sharing-create-complete.blade.php | 168 + app/views/experiment/no-sharing-edit.blade.php | 96 + app/views/experiment/summary.blade.php | 3 +- app/views/group/browse.blade.php | 0 app/views/group/create.blade.php | 75 + app/views/group/edit.blade.php | 0 app/views/group/summary.blade.php | 0 app/views/home.blade.php | 41 +- .../compute-resource-preferences.blade.php | 57 + app/views/partials/dashboard-block.blade.php | 2 +- .../partials/experiment-container.blade.php | 20 +- app/views/partials/experiment-info.blade.php | 102 +- app/views/partials/experiment-inputs.blade.php | 12 +- .../partials/sharing-display-body.blade.php | 22 + app/views/partials/sharing-form-body.blade.php | 17 + app/views/partials/sharing-form-modal.blade.php | 18 + app/views/partials/streaming-data.blade.php | 4 + app/views/project/browse.blade.php | 8 +- app/views/project/create.blade.php | 15 +- app/views/project/edit.blade.php | 26 +- app/views/project/no-sharing-browse.blade.php | 146 + app/views/project/no-sharing-create.blade.php | 33 + app/views/project/no-sharing-edit.blade.php | 49 + app/views/project/no-sharing-summary.blade.php | 103 + app/views/project/summary.blade.php | 30 +- .../assets/Profile_avatar_placeholder_large.png | Bin 0 -> 2011 bytes .../assets/powered-by-airavata-transparent.png | Bin 0 -> 40630 bytes public/css/sharing.css | 108 + public/js/sharing/groups.js | 162 + public/js/sharing/share.js | 340 + public/js/sharing/sharing_utils.js | 195 + public/js/simstream.js | 180 + 72 files changed, 14346 insertions(+), 6421 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d8c6e814/app/libraries/ProjectUtilities.php ---------------------------------------------------------------------- diff --cc app/libraries/ProjectUtilities.php index 16fefc8,4f26782..1a58c61 mode 100644,100755..100755 --- a/app/libraries/ProjectUtilities.php +++ b/app/libraries/ProjectUtilities.php
