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/03/24 21:28:26 UTC
[airavata-django-portal] branch delta-topology-workshop updated
(f071b42 -> 65c62de)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch delta-topology-workshop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from f071b42 Merge branch 'master' into delta-topology-workshop
add ce39667 Documenting generate_data parameters
add 4611f66 Fix link to dreg output view
add 1ad4e74 WIP
add 8b0a93a AIRAVATA-3415 Fix bug loading app module when app has been deleted
add d2fca49 Option to add Nav Extra links to main menu dropdown
new 65c62de Merge branch 'master' into delta-topology-workshop
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
django_airavata/apps/api/views.py | 8 ++++----
.../static/common/js/components/ShareButton.vue | 3 ++-
django_airavata/templates/base.html | 1 +
.../includes/main_menu_navs.html | 10 ++++++++++
django_airavata/wagtailapps/base/blocks.py | 4 ++++
.../base/migrations/0025_auto_20210319_2247.py | 21 +++++++++++++++++++++
.../base/templatetags/navigation_tags.py | 19 +++++++++++++++++++
docs/dev/custom_output_view_provider.md | 17 ++++++++++++++++-
docs/tutorial/gateways_tutorial.md | 12 +++++++-----
9 files changed, 84 insertions(+), 11 deletions(-)
create mode 100644 django_airavata/templates/django_airavata_wagtail_base/includes/main_menu_navs.html
create mode 100644 django_airavata/wagtailapps/base/migrations/0025_auto_20210319_2247.py
[airavata-django-portal] 01/01: Merge branch 'master' into
delta-topology-workshop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch delta-topology-workshop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 65c62de64033c14904ff9de7947589fc0d27d3d0
Merge: f071b42 d2fca49
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Mar 24 17:28:09 2021 -0400
Merge branch 'master' into delta-topology-workshop
django_airavata/apps/api/views.py | 8 ++++----
.../static/common/js/components/ShareButton.vue | 3 ++-
django_airavata/templates/base.html | 1 +
.../includes/main_menu_navs.html | 10 ++++++++++
django_airavata/wagtailapps/base/blocks.py | 4 ++++
.../base/migrations/0025_auto_20210319_2247.py | 21 +++++++++++++++++++++
.../base/templatetags/navigation_tags.py | 19 +++++++++++++++++++
docs/dev/custom_output_view_provider.md | 17 ++++++++++++++++-
docs/tutorial/gateways_tutorial.md | 12 +++++++-----
9 files changed, 84 insertions(+), 11 deletions(-)