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 2020/06/23 22:19:49 UTC

[airavata-django-portal] 02/02: Merge branch 'AIRAVATA-3340' 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 7e330f79edf7054342412746592bad3667bc06b0
Merge: 53ccaa0 3c28e42
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 23 18:17:59 2020 -0400

    Merge branch 'AIRAVATA-3340' into develop

 django_airavata/apps/workspace/package.json        |   1 +
 .../components/experiment/QueueSettingsEditor.vue  |  12 +-
 .../input-editors/AutocompleteInputEditor.vue      | 151 ++++++++++++
 .../input-editors/InputEditorContainer.vue         |   4 +-
 .../common/js/components/AutocompleteTextInput.vue |   9 +-
 docs/admin/app_inputs.md                           | 268 +++++++++++++++++++++
 docs/images/app-input-metadata.png                 | Bin 0 -> 244374 bytes
 mkdocs.yml                                         |   1 +
 8 files changed, 440 insertions(+), 6 deletions(-)

diff --cc mkdocs.yml
index 6bf42ea,74cecb1..fdde766
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@@ -11,12 -11,12 +11,13 @@@ nav
      - Developing the Frontend: dev/developing_frontend.md
      - Developing the Backend: dev/developing_backend.md
      - Developing a Wagtail Export (theme): dev/wagtail_export.md
 +  - Customization Guide:
 +    - Gateways 2019 Tutorial: tutorial/gateways2019_tutorial.md
 +    - Adding a Custom Django App: dev/custom_django_app.md
 +    - Adding a Custom Output View Provider: dev/custom_output_view_provider.md
    - Administrator Guide:
+     - Application Input Customization: admin/app_inputs.md
      - Tusd Installation: admin/tusd.md
 -  - Tutorials:
 -    - Gateways 2019: tutorial/gateways2019_tutorial.md
  
  theme: readthedocs