You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/08/27 19:11:55 UTC
[2/3] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
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/3f5ea2f2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3f5ea2f2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3f5ea2f2
Branch: refs/heads/develop
Commit: 3f5ea2f2bead25005d6a9669509a6f416700a74e
Parents: f8cb990 1618472
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Thu Aug 25 03:23:17 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Thu Aug 25 03:23:17 2016 -0700
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 166 +++++++++++------
app/controllers/ProjectController.php | 83 +++++++--
.../Airavata/Model/Messaging/Event/Types.php | 124 +++++++++++--
.../Airavata/Model/Workspace/Types.php | 25 +++
app/libraries/ExperimentUtilities.php | 31 ++--
app/libraries/ProjectUtilities.php | 23 ++-
app/libraries/SharingUtilities.php | 28 ++-
.../Wsis/Stubs/AuthenticationAdminStub.php | 3 +
app/routes.php | 8 +
app/views/experiment/create-complete.blade.php | 2 +
app/views/experiment/edit.blade.php | 2 +
.../partials/experiment-container.blade.php | 16 +-
app/views/partials/experiment-info.blade.php | 29 ++-
app/views/partials/sharing-form-modal.blade.php | 2 +-
app/views/partials/streaming-data.blade.php | 4 +
app/views/project/browse.blade.php | 4 +-
app/views/project/edit.blade.php | 3 +
app/views/project/summary.blade.php | 12 +-
public/js/sharing/share.js | 77 +++++---
public/js/sharing/sharing_utils.js | 8 +-
public/js/simstream.js | 180 +++++++++++++++++++
21 files changed, 675 insertions(+), 155 deletions(-)
----------------------------------------------------------------------