Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8A61A200B70 for ; Sat, 27 Aug 2016 21:11:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 88DED160AC5; Sat, 27 Aug 2016 19:11:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CDCCF160AB0 for ; Sat, 27 Aug 2016 21:11:55 +0200 (CEST) Received: (qmail 63100 invoked by uid 500); 27 Aug 2016 19:11:55 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 63084 invoked by uid 99); 27 Aug 2016 19:11:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Aug 2016 19:11:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2DB5E1170; Sat, 27 Aug 2016 19:11:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ndoshi@apache.org To: commits@airavata.apache.org Date: Sat, 27 Aug 2016 19:11:55 -0000 Message-Id: <82f15ddaa60e42e7a0dd0962832e2697@git.apache.org> In-Reply-To: <5d82eda3176a4efa837f2cc6ad594342@git.apache.org> References: <5d82eda3176a4efa837f2cc6ad594342@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop archived-at: Sat, 27 Aug 2016 19:11:56 -0000 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 Authored: Thu Aug 25 03:23:17 2016 -0700 Committer: Nipurn Doshi 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(-) ----------------------------------------------------------------------