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 2018/11/20 16:12:05 UTC
[airavata-django-portal] branch simccs updated (446b891 -> e940953)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch simccs
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 446b891 Merge branch 'master' into simccs
add 3151c6d AIRAVATA-2929 Disallow editing admin groups for some resource types
add 346649d AIRAVATA-2927 Workaround users/groups that share id
add ef31511 AIRAVATA-2927 Revert change to suggestion id, no longer needed
add 0e7993a AIRAVATA-2896 Fix saving sharing when default group auto added
new e940953 Merge branch 'master' into simccs
The 1 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:
.../dashboards/CredentialStoreDashboard.vue | 4 +--
.../static/common/js/components/ShareButton.vue | 33 +++++++++++-----------
.../common/js/components/SharedEntityEditor.vue | 32 ++++++++++++++++-----
3 files changed, 44 insertions(+), 25 deletions(-)
[airavata-django-portal] 01/01: Merge branch 'master' into simccs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch simccs
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit e940953a8aa4569d627923ab3be18654107a4c6f
Merge: 446b891 0e7993a
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Tue Nov 20 11:11:53 2018 -0500
Merge branch 'master' into simccs
.../dashboards/CredentialStoreDashboard.vue | 4 +--
.../static/common/js/components/ShareButton.vue | 33 +++++++++++-----------
.../common/js/components/SharedEntityEditor.vue | 32 ++++++++++++++++-----
3 files changed, 44 insertions(+), 25 deletions(-)