[airavata-custos-portal] branch master updated (dd7ba07 -> cddc1bf)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-custos-portal.git


    from dd7ba07  Merge pull request #173 from apache:fix-django-dockerfile
     add 2a51327  Run dev server on port 9002 since local Custos docker containers take ports 9000 and 9001
     add 3f86396  Downgrade PyJWT, newer one has incompatible method signature
     add e3c9d8d  Updated README with quickstart instructions for working with Custos local development
     new cddc1bf  Merge pull request #176 from apache/local-custos-integration-fixes

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:
 README.md        | 60 ++++++++++++++++++++++++++++++++++++++++++++++----------
 requirements.txt |  2 +-
 vue.config.js    |  2 +-
 3 files changed, 52 insertions(+), 12 deletions(-)

[airavata-custos-portal] 01/01: Merge pull request #176 from apache/local-custos-integration-fixes

[ma...@apache.org]

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-custos-portal.git

commit cddc1bfb33bec81460b3a79c6bc7935ef0c932e4
Merge: dd7ba07 e3c9d8d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed May 3 09:26:54 2023 -0400

    Merge pull request #176 from apache/local-custos-integration-fixes
    
    Fixes for running the Custos portal against a local Custos deployment

 README.md        | 60 ++++++++++++++++++++++++++++++++++++++++++++++----------
 requirements.txt |  2 +-
 vue.config.js    |  2 +-
 3 files changed, 52 insertions(+), 12 deletions(-)