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/12/12 23:20:17 UTC

[airavata-django-portal] 01/01: Merge branch 'airavata-3243' into develop

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 24888c07b0ef2560df6c14a01082ccc5c5d1a91a
Merge: 6b07e76 0a7ba8d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Dec 12 18:18:15 2019 -0500

    Merge branch 'airavata-3243' into develop

 .gitignore                                         |   2 +-
 .travis.yml                                        |   1 +
 .../src/components/users/UserDetailsContainer.vue  |  50 ++-
 django_airavata/apps/admin/vue.config.js           |   1 +
 django_airavata/apps/api/signals.py                |   9 +-
 .../django_airavata_api/js/models/BaseModel.js     |  11 +-
 .../django_airavata_api/js/models/JobState.js      |   1 +
 django_airavata/apps/api/tests.py                  | 385 ++++++++++++++++++++-
 django_airavata/apps/api/views.py                  |  28 ++
 django_airavata/apps/auth/apps.py                  |   3 +
 .../auth/migrations/0005_auto_20191211_2011.py     |  66 ++++
 django_airavata/apps/auth/models.py                |   2 +
 django_airavata/apps/auth/signals.py               |  25 ++
 django_airavata/apps/auth/tests.py                 |  82 ++++-
 django_airavata/apps/auth/utils.py                 |  18 +
 django_airavata/apps/auth/views.py                 |  24 +-
 django_airavata/apps/dataparsers/vue.config.js     |   1 +
 django_airavata/apps/groups/vue.config.js          |   1 +
 .../vue.config.js                                  |   3 +-
 .../output-displays/DefaultOutputDisplay.vue       |   4 +-
 django_airavata/apps/workspace/vue.config.js       |   1 +
 django_airavata/settings.py                        |   1 +
 django_airavata/static/common/vue.config.js        |   1 +
 docs/dev/new_django_app.md                         |   1 +
 24 files changed, 681 insertions(+), 40 deletions(-)