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 2021/09/24 20:52:07 UTC
[airavata-django-portal] 05/05: Merge branch 'django32-upgrade'
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 01268aed7045eab69e1b846ccf65a9d3d75bd573
Merge: 7e79e1e 507572c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Sep 24 16:51:26 2021 -0400
Merge branch 'django32-upgrade' into develop
django_airavata/apps/admin/urls.py | 25 ++-
django_airavata/apps/api/signals.py | 3 +-
django_airavata/apps/api/thrift_utils.py | 4 +-
django_airavata/apps/api/urls.py | 109 ++++++-----
django_airavata/apps/auth/urls.py | 56 +++---
django_airavata/apps/dataparsers/urls.py | 12 +-
django_airavata/apps/groups/urls.py | 8 +-
django_airavata/apps/workspace/urls.py | 26 +--
django_airavata/settings.py | 2 +
django_airavata/urls.py | 38 ++--
.../base/migrations/0026_auto_20210923_2212.py | 48 +++++
docs/assets/js/clipboard.min.js | 7 +
docs/assets/js/clipboard_init.js | 1 +
docs/dev/new_django_app.md | 4 +-
docs/tutorial/custom_ui_tutorial.md | 199 ++++++++++++++++++---
mkdocs.yml | 4 +
requirements.txt | 8 +-
17 files changed, 381 insertions(+), 173 deletions(-)