You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by ma...@apache.org on 2019/05/09 16:20:01 UTC

[airavata-django-portal] 06/06: Merge branch 'airavata-3030'

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit cddab50884c091ee0764bdd56b1590e716508a9f
Merge: 6e2b258 e6a9107
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu May 9 12:18:40 2019 -0400

    Merge branch 'airavata-3030'

 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(-)