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/06/15 16:03:25 UTC
[airavata-django-portal] 01/01: Merge pull request #12 from
eldhomathulla/master
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 11c180fa48b9a39d9ea483770574a65cbc9ea881
Merge: ad977a5 1123793
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Fri Jun 15 12:03:13 2018 -0400
Merge pull request #12 from eldhomathulla/master
group resource profile
django_airavata/apps/admin/.babelrc | 6 +-
django_airavata/apps/admin/package.json | 2 +-
.../src/components/admin/NewApplication.vue | 1 -
.../src/components/admin/TabActionConsole.vue | 10 +-
.../BatchQueueResourcePolicy.vue | 4 +-
.../ComputePreference.vue | 190 +++++++++++++---
.../ComputePreferences.vue | 10 +-
.../ComputeResourcePolicy.vue | 114 +++++-----
.../GroupComputeResourcePreference.vue | 183 ++++++++++++---
.../src/components/commons/PopupComponent.vue | 101 +++++++++
.../src/components/dashboards/AdminDashboard.vue | 15 +-
.../ComputeResourcePreferenceDashboard.vue | 55 ++---
.../static/django_airavata_admin/src/router.js | 8 +-
django_airavata/apps/api/.babelrc | 5 +
django_airavata/apps/api/package-lock.json | 9 +
django_airavata/apps/api/package.json | 3 +-
django_airavata/apps/api/serializers.py | 12 +-
.../django_airavata_api/js/service_config.js | 64 +++---
.../js/services/ServiceFactory.js | 77 ++++++-
.../django_airavata_api/js/utils/FetchUtils.js | 62 +++++-
.../js/utils/PaginationIterator.js | 9 +
django_airavata/apps/api/thrift_utils.py | 54 ++++-
django_airavata/apps/api/urls.py | 2 +-
django_airavata/apps/api/view_utils.py | 168 ++++++++++++++
django_airavata/apps/api/views.py | 247 +++++----------------
django_airavata/settings.py | 2 +-
.../static/common/js/components/Autocomplete.vue | 14 +-
django_airavata/static/common/scss/main.scss | 2 +-
django_airavata/templates/base.html | 159 +++++++++++--
29 files changed, 1162 insertions(+), 426 deletions(-)
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.