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 4a0c407609efd36233d7f1c17533f5d1bf817eef Merge: 405f484 6b07e76 Author: Marcus Christie <machris...@apache.org> AuthorDate: Wed Apr 22 20:40:24 2020 -0400 Merge branch 'airavata-3268' airavata/model/application/io/ttypes.py | 16 +++++++++++++++- airavata/model/sharing/ttypes.py | 15 ++++++++++++++- airavata/service/profile/user/cpi/UserProfileService.py | 8 ++++++++ .../applications/ApplicationInputFieldEditor.vue | 17 +++++++++++++---- .../applications/ApplicationInterfaceEditor.vue | 7 ++++--- .../src/components/applications/JSONEditor.vue | 1 - .../js/models/InputDataObjectType.js | 3 ++- 7 files changed, 56 insertions(+), 11 deletions(-)