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/07/30 18:35:37 UTC

[airavata-django-portal] 01/06: Merge branch 'master' 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 ec660ed48e1bed2c776d37c89d705e4a1548e57e
Merge: 9bb685a e6f8735
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jul 30 13:25:57 2021 -0400

    Merge branch 'master' into develop

 README.md                                          |   16 +
 build_js.bat                                       |   36 +
 django_airavata/static/common/package.json         |    3 +-
 django_airavata/static/common/yarn.lock            |  387 +++++---
 docs/assets/css/pymdownx.tabbed.css                |   47 +
 docs/dev/custom_django_app.md                      |  295 +++---
 docs/dev/custom_output_view_provider.md            |  121 ++-
 ...{gateways_tutorial.md => custom_ui_tutorial.md} | 1023 ++++++++++++--------
 .../screenshots/custom-ui/custom-app-menu.png      |  Bin 0 -> 177809 bytes
 .../gaussian-output-view-providers-json.png        |  Bin 0 -> 31419 bytes
 .../screenshots/custom-ui/settings_menu.png        |  Bin 0 -> 181704 bytes
 mkdocs.yml                                         |    6 +-
 requirements-dev.txt                               |    3 +-
 setup.py                                           |    1 -
 14 files changed, 1221 insertions(+), 717 deletions(-)