This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 91e431889394b37bd21eb70e1c5afeae82cd8f39
Merge: ea01ec8 f322b37
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Wed Mar 25 16:06:53 2020 -0400
Merge branch
'AIRAVATA-3126--Implement-compute-resource-reservation-addition' into develop
.../appcatalog/groupresourceprofile/ttypes.py | 217 +++++++++++++++---
.../ComputePreference.vue | 119 +++++++---
.../ComputeResourceReservationEditor.vue | 158 +++++++++++++
.../ComputeResourceReservationList.vue | 251 +++++++++++++++++++++
.../ComputeResourceReservationsSummary.vue | 45 ++++
.../GroupComputeResourcePreference.vue | 108 ++++++---
.../gatewayprofile/StoragePreferenceList.vue | 2 +-
django_airavata/apps/api/serializers.py | 9 +-
.../api/static/django_airavata_api/js/index.js | 2 +
.../django_airavata_api/js/models/BaseModel.js | 229 ++++++++++---------
.../js/models/ComputeResourceReservation.js | 65 ++++++
.../js/models/GroupComputeResourcePreference.js | 8 +-
django_airavata/settings_local.py.ide | 6 +-
.../static/common/js/components/DeleteButton.vue | 6 +-
.../static/common/js/components/HumanDate.vue | 2 +-
.../static/common/js/layouts/ListLayout.vue | 2 +
django_airavata/static/common/js/utils.js | 25 +-
17 files changed, 1047 insertions(+), 207 deletions(-)
