From commits-return-20552-apmail-airavata-commits-archive=airavata.apache.org@airavata.apache.org Thu May 9 16:19:56 2019 Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id 4E0A919A88 for ; Thu, 9 May 2019 16:19:56 +0000 (UTC) Received: (qmail 20848 invoked by uid 500); 9 May 2019 16:19:55 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 20730 invoked by uid 500); 9 May 2019 16:19: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 20689 invoked by uid 99); 9 May 2019 16:19:55 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 May 2019 16:19:55 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 5BCA1872D6; Thu, 9 May 2019 16:19:55 +0000 (UTC) Date: Thu, 09 May 2019 16:19:55 +0000 To: "commits@airavata.apache.org" Subject: [airavata-django-portal] branch master updated (6e2b258 -> cddab50) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155741879529.7355.14111152610686824429@gitbox.apache.org> From: machristie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata-django-portal X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 6e2b258f8ce207ea53a46c32d9231683cbb4b076 X-Git-Newrev: cddab50884c091ee0764bdd56b1590e716508a9f X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git. from 6e2b258 Fix order of imports new a303753 AIRAVATA-3030 Display inherited parent permissions, parent entity owner new 5ff4acf AIRAVATA-3030 Add inherited parent permissions to tooltip, count new a09919c AIRAVATA-3030: fix changing user permission new 8e7ad61 AIRAVATA-3030 Loading directly granted sharings for editing new e6a9107 AIRAVATA-3030 simplified code for displaying inherited sharings new cddab50 Merge branch 'airavata-3030' The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: airavata/api/Airavata-remote | 14 + airavata/api/Airavata.py | 1122 +++++++++++++++----- airavata/api/sharing/SharingRegistryService-remote | 14 + airavata/api/sharing/SharingRegistryService.py | 562 +++++++++- django_airavata/apps/api/views.py | 66 +- .../js/components/experiment/ExperimentEditor.vue | 3 + .../static/common/js/components/ShareButton.vue | 128 ++- .../common/js/components/SharedEntityEditor.vue | 40 +- 8 files changed, 1615 insertions(+), 334 deletions(-)