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 2018/11/19 21:31:32 UTC
[airavata-django-portal] branch simccs updated (9b98ea0 -> 446b891)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch simccs
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 9b98ea0 Merge pull request #18 from gowtham06/simccs
add 3d63b72 AIRAVATA-2890 Regenerated Thrift stubs
add d1e7781 AIRAVATA-2888 Get service account token
add 5750d9b AIRAVATA-2888 Create account form validation
add bdb9e4a Add metadata field editor to app input editor
add dfa08cd Improving formatting of long imports
add cacfb28 Fixing formatting of imports
add 9a3da0a VModelMixin refactor
add a729e86 AIRAVATA-2888 Register user if create acct form valid
add e93b56e AIRAVATA-2888 Username, password validation
add ad24124 AIRAVATA-2888 Generate email verification code and email
add 01387e4 Removing navextra from wagtail export files
add 21045f1 AIRAVATA-2888 Email verification email handler
add e1c2261 AIRAVATA-2888 Resend email verification link form
add 8105339 AIRAVATA-2888 Success/error messages
add ab00e53 AIRAVATA-2888 DB model for email templates
add 9b0b28e AIRAVATA-2888 Fix To for admin emails
add 0e7737b AIRAVATA-2888 Default Create Account nav link block
add 6b1dad0 AIRAVATA-2888 Fixing formatting
add 8733264 AIRAVATA-2888 formatting fix
add ab73a8a AIRAVATA-2888 Create acct form help text
add 0fd592a AIRAVATA-2888 Add new nav extra, create account/login buttons to default theme
add bae7376 AIRAVATA-2711 Regenerated Python thrift models
add f39ed7f AIRAVATA-2711 REST API to update group admins
add 76083c6 AIRAVATA-2711 Switch to using ServiceFactory for groups
add 173edb7 AIRAVATA-2711 Raise AutocompleteTextInput above form-controls
add fe389d0 AIRAVATA-2711 Convert Autocomplete to VModelMixin
add bc8b0ef AIRAVATA-2711 Switch member editor to table layout
add b6f870f AIRAVATA-2711 Change role of group members
add a1607ec AIRAVATA-2711 Sorting members, UI clean up
add e6d9344 AIRAVATA-2711 Only owners can edit admins
add 1d847ad AIRAVATA-2711 Removing Autocomplete.vue component
add aa81587 AIRAVATA-2907 GatewayResourceProfile editor UI
add 5236001 AIRAVATA-2907 Add new storage preference UI
add da40a7b AIRAVATA-2907 Only allow Admins to edit GatewayResourceProfile
add dd63cc1 AIRAVATA-2907 Better default ssh key description; filter storage options
add fd358e4 AIRAVATA-2907 Formatting storage pref listing
add d30077b AIRAVATA-2907 Delete storage prefs
add a928e60 AIRAVATA-2949 Fix list of current group members
add a60471e Updating package-lock.json files
add 6421847 AIRAVATA-2711 Fix creating new group
add 5a3a606 Updating package-lock.json files
add e69def5 AIRAVATA-2951 Removing package-lock.json files
add 7e6243d AIRAVATA-2931 Don't allow owner to be removed from group
add 885de30 Remove gateway id from owner username
add 237099f remove .editorconfig from admin app
add 20e0469 Don't allow non admin users to create applications
new 446b891 Merge branch 'master' into simccs
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:
.gitignore | 2 +
airavata/api/Airavata-remote | 7 +
airavata/api/Airavata.py | 290 +
airavata/model/group/ttypes.py | 26 +-
.../iam/admin/services/cpi/IamAdminServices-remote | 21 +
.../iam/admin/services/cpi/IamAdminServices.py | 852 +-
django_airavata/apps/admin/.editorconfig | 9 -
django_airavata/apps/admin/package-lock.json | 20866 -------------------
.../ComputePreference.vue | 21 +-
.../GroupComputeResourcePreference.vue | 3 -
.../applications/ApplicationDeploymentEditor.vue | 5 +-
.../applications/ApplicationInputFieldEditor.vue | 18 +-
.../applications/ApplicationInterfaceEditor.vue | 4 +-
.../applications/ApplicationModuleEditor.vue | 5 +-
.../applications/ApplicationOutputFieldEditor.vue | 4 +-
.../applications/CommandObjectsEditor.vue | 4 +-
.../src/components/applications/JSONEditor.vue | 47 +
.../components/applications/SetEnvPathsEditor.vue | 4 +-
.../src/components/commons/ArrayComponentView.vue | 4 +-
.../src/components/commons/PopupComponent.vue | 4 +-
.../credentials/SSHCredentialSelector.vue | 53 +-
.../GatewayResourceProfileEditor.vue | 28 +
.../GatewayResourceProfileEditorContainer.vue | 105 +
.../gatewayprofile/StoragePreferenceEditor.vue | 43 +
.../gatewayprofile/StoragePreferenceList.vue | 201 +
.../static/django_airavata_admin/src/router.js | 6 +
.../apps/admin/templates/admin/admin_base.html | 7 +
django_airavata/apps/admin/urls.py | 2 +
django_airavata/apps/admin/views.py | 11 +-
django_airavata/apps/api/datastore.py | 12 +-
django_airavata/apps/api/package-lock.json | 2167 --
django_airavata/apps/api/serializers.py | 136 +-
.../api/static/django_airavata_api/js/index.js | 8 +-
.../js/models/GatewayResourceProfile.js | 21 +
.../static/django_airavata_api/js/models/Group.js | 67 +-
.../js/models/StoragePreference.js | 14 +
.../js/models/StorageResourceDescription.js | 17 +
.../django_airavata_api/js/service_config.js | 49 +
.../js/services/GroupService.js | 63 -
django_airavata/apps/api/thrift_utils.py | 27 +-
django_airavata/apps/api/urls.py | 11 +
django_airavata/apps/api/views.py | 147 +-
django_airavata/apps/auth/admin.py | 5 +-
django_airavata/apps/auth/forms.py | 101 +
django_airavata/apps/auth/iam_admin_client.py | 53 +
django_airavata/apps/auth/middleware.py | 5 +-
.../apps/auth/migrations/0001_initial.py | 27 +
.../apps/auth/migrations/0002_emailtemplate.py | 25 +
.../migrations/0003_default_email_templates.py | 57 +
django_airavata/apps/auth/models.py | 33 +-
.../django_airavata_auth/create_account.html | 71 +-
.../auth/templates/django_airavata_auth/login.html | 9 +-
.../django_airavata_auth/verify_email.html | 58 +
django_airavata/apps/auth/urls.py | 6 +-
django_airavata/apps/auth/utils.py | 25 +
django_airavata/apps/auth/views.py | 191 +-
django_airavata/apps/groups/package-lock.json | 18683 -----------------
.../js/containers/GroupEditContainer.vue | 2 +-
.../js/containers/GroupsManageContainer.vue | 2 +-
.../js/group_components/GroupEditor.vue | 116 +-
.../js/group_components/GroupListItem.vue | 11 +-
.../js/group_components/GroupMembersEditor.vue | 162 +
.../package-lock.json | 5703 -----
django_airavata/apps/workspace/package-lock.json | 18689 -----------------
django_airavata/apps/workspace/views.py | 20 +-
django_airavata/settings.py | 4 +
django_airavata/settings_local.py.sample | 23 +-
.../static/common/js/components/Autocomplete.vue | 70 -
.../common/js/components/AutocompleteTextInput.vue | 8 +-
.../static/common/js/components/ShareButton.vue | 4 +-
django_airavata/static/common/js/index.js | 2 -
.../static/common/js/layouts/ListLayout.vue | 5 +
django_airavata/static/common/package-lock.json | 8920 --------
.../includes/gateway_title.html | 2 +-
django_airavata/urls.py | 2 +
django_airavata/utils.py | 19 +-
django_airavata/wagtailapps/base/blocks.py | 90 +-
.../wagtailapps/base/fixtures/default.json | 218 +-
.../wagtailapps/base/fixtures/hpcgateway.json | 20 -
.../wagtailapps/base/fixtures/nanoconfinement.json | 20 -
django_airavata/wagtailapps/base/fixtures/osu.json | 19 -
.../wagtailapps/base/fixtures/phasta.json | 19 -
.../wagtailapps/base/fixtures/seagrid.json | 19 -
.../wagtailapps/base/fixtures/searchingsra.json | 19 -
.../wagtailapps/base/fixtures/simccs.json | 20 -
.../wagtailapps/base/fixtures/simvascular.json | 19 -
django_airavata/wagtailapps/base/fixtures/siu.json | 19 -
.../wagtailapps/base/fixtures/southdakota.json | 19 -
...20180417_2034.py => 0019_auto_20181025_1522.py} | 16 +-
django_airavata/wagtailapps/base/models.py | 13 +-
.../base/templatetags/navigation_tags.py | 19 +-
django_airavata/wagtailapps/base/wagtail_hooks.py | 3 +-
setup.cfg | 11 +
93 files changed, 3320 insertions(+), 75747 deletions(-)
delete mode 100644 django_airavata/apps/admin/.editorconfig
delete mode 100644 django_airavata/apps/admin/package-lock.json
create mode 100644 django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/JSONEditor.vue
create mode 100644 django_airavata/apps/admin/static/django_airavata_admin/src/components/gatewayprofile/GatewayResourceProfileEditor.vue
create mode 100644 django_airavata/apps/admin/static/django_airavata_admin/src/components/gatewayprofile/GatewayResourceProfileEditorContainer.vue
create mode 100644 django_airavata/apps/admin/static/django_airavata_admin/src/components/gatewayprofile/StoragePreferenceEditor.vue
create mode 100644 django_airavata/apps/admin/static/django_airavata_admin/src/components/gatewayprofile/StoragePreferenceList.vue
delete mode 100644 django_airavata/apps/api/package-lock.json
create mode 100644 django_airavata/apps/api/static/django_airavata_api/js/models/GatewayResourceProfile.js
create mode 100644 django_airavata/apps/api/static/django_airavata_api/js/models/StoragePreference.js
create mode 100644 django_airavata/apps/api/static/django_airavata_api/js/models/StorageResourceDescription.js
delete mode 100644 django_airavata/apps/api/static/django_airavata_api/js/services/GroupService.js
create mode 100644 django_airavata/apps/auth/forms.py
create mode 100644 django_airavata/apps/auth/iam_admin_client.py
create mode 100644 django_airavata/apps/auth/migrations/0001_initial.py
create mode 100644 django_airavata/apps/auth/migrations/0002_emailtemplate.py
create mode 100644 django_airavata/apps/auth/migrations/0003_default_email_templates.py
create mode 100644 django_airavata/apps/auth/templates/django_airavata_auth/verify_email.html
delete mode 100644 django_airavata/apps/groups/package-lock.json
create mode 100644 django_airavata/apps/groups/static/django_airavata_groups/js/group_components/GroupMembersEditor.vue
delete mode 100644 django_airavata/apps/workspace/django-airavata-workspace-plugin-api/package-lock.json
delete mode 100644 django_airavata/apps/workspace/package-lock.json
delete mode 100644 django_airavata/static/common/js/components/Autocomplete.vue
delete mode 100644 django_airavata/static/common/package-lock.json
copy django_airavata/wagtailapps/base/migrations/{0013_auto_20180417_2034.py => 0019_auto_20181025_1522.py} (50%)
[airavata-django-portal] 01/01: Merge branch 'master' into simccs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch simccs
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 446b891eadd0824590743c7917e8fa7de763ff97
Merge: 9b98ea0 20e0469
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Nov 19 16:31:21 2018 -0500
Merge branch 'master' into simccs
.gitignore | 2 +
airavata/api/Airavata-remote | 7 +
airavata/api/Airavata.py | 290 +
airavata/model/group/ttypes.py | 26 +-
.../iam/admin/services/cpi/IamAdminServices-remote | 21 +
.../iam/admin/services/cpi/IamAdminServices.py | 852 +-
django_airavata/apps/admin/.editorconfig | 9 -
django_airavata/apps/admin/package-lock.json | 20866 -------------------
.../ComputePreference.vue | 21 +-
.../GroupComputeResourcePreference.vue | 3 -
.../applications/ApplicationDeploymentEditor.vue | 5 +-
.../applications/ApplicationInputFieldEditor.vue | 18 +-
.../applications/ApplicationInterfaceEditor.vue | 4 +-
.../applications/ApplicationModuleEditor.vue | 5 +-
.../applications/ApplicationOutputFieldEditor.vue | 4 +-
.../applications/CommandObjectsEditor.vue | 4 +-
.../src/components/applications/JSONEditor.vue | 47 +
.../components/applications/SetEnvPathsEditor.vue | 4 +-
.../src/components/commons/ArrayComponentView.vue | 4 +-
.../src/components/commons/PopupComponent.vue | 4 +-
.../credentials/SSHCredentialSelector.vue | 53 +-
.../GatewayResourceProfileEditor.vue | 28 +
.../GatewayResourceProfileEditorContainer.vue | 105 +
.../gatewayprofile/StoragePreferenceEditor.vue | 43 +
.../gatewayprofile/StoragePreferenceList.vue | 201 +
.../static/django_airavata_admin/src/router.js | 6 +
.../apps/admin/templates/admin/admin_base.html | 7 +
django_airavata/apps/admin/urls.py | 2 +
django_airavata/apps/admin/views.py | 11 +-
django_airavata/apps/api/datastore.py | 12 +-
django_airavata/apps/api/package-lock.json | 2167 --
django_airavata/apps/api/serializers.py | 136 +-
.../api/static/django_airavata_api/js/index.js | 8 +-
.../js/models/GatewayResourceProfile.js | 21 +
.../static/django_airavata_api/js/models/Group.js | 67 +-
.../js/models/StoragePreference.js | 14 +
.../js/models/StorageResourceDescription.js | 17 +
.../django_airavata_api/js/service_config.js | 49 +
.../js/services/GroupService.js | 63 -
django_airavata/apps/api/thrift_utils.py | 27 +-
django_airavata/apps/api/urls.py | 11 +
django_airavata/apps/api/views.py | 147 +-
django_airavata/apps/auth/admin.py | 5 +-
django_airavata/apps/auth/forms.py | 101 +
django_airavata/apps/auth/iam_admin_client.py | 53 +
django_airavata/apps/auth/middleware.py | 5 +-
.../apps/auth/migrations/0001_initial.py | 27 +
.../apps/auth/migrations/0002_emailtemplate.py | 25 +
.../migrations/0003_default_email_templates.py | 57 +
django_airavata/apps/auth/models.py | 33 +-
.../django_airavata_auth/create_account.html | 71 +-
.../auth/templates/django_airavata_auth/login.html | 9 +-
.../django_airavata_auth/verify_email.html | 58 +
django_airavata/apps/auth/urls.py | 6 +-
django_airavata/apps/auth/utils.py | 25 +
django_airavata/apps/auth/views.py | 191 +-
django_airavata/apps/groups/package-lock.json | 18683 -----------------
.../js/containers/GroupEditContainer.vue | 2 +-
.../js/containers/GroupsManageContainer.vue | 2 +-
.../js/group_components/GroupEditor.vue | 116 +-
.../js/group_components/GroupListItem.vue | 11 +-
.../js/group_components/GroupMembersEditor.vue | 162 +
.../package-lock.json | 5703 -----
django_airavata/apps/workspace/package-lock.json | 18689 -----------------
django_airavata/apps/workspace/views.py | 20 +-
django_airavata/settings.py | 4 +
django_airavata/settings_local.py.sample | 23 +-
.../static/common/js/components/Autocomplete.vue | 70 -
.../common/js/components/AutocompleteTextInput.vue | 8 +-
.../static/common/js/components/ShareButton.vue | 4 +-
django_airavata/static/common/js/index.js | 2 -
.../static/common/js/layouts/ListLayout.vue | 5 +
django_airavata/static/common/package-lock.json | 8920 --------
.../includes/gateway_title.html | 2 +-
django_airavata/urls.py | 2 +
django_airavata/utils.py | 19 +-
django_airavata/wagtailapps/base/blocks.py | 90 +-
.../wagtailapps/base/fixtures/default.json | 218 +-
.../wagtailapps/base/fixtures/hpcgateway.json | 20 -
.../wagtailapps/base/fixtures/nanoconfinement.json | 20 -
django_airavata/wagtailapps/base/fixtures/osu.json | 19 -
.../wagtailapps/base/fixtures/phasta.json | 19 -
.../wagtailapps/base/fixtures/seagrid.json | 19 -
.../wagtailapps/base/fixtures/searchingsra.json | 19 -
.../wagtailapps/base/fixtures/simccs.json | 20 -
.../wagtailapps/base/fixtures/simvascular.json | 19 -
django_airavata/wagtailapps/base/fixtures/siu.json | 19 -
.../wagtailapps/base/fixtures/southdakota.json | 19 -
.../base/migrations/0019_auto_20181025_1522.py | 49 +
django_airavata/wagtailapps/base/models.py | 13 +-
.../base/templatetags/navigation_tags.py | 19 +-
django_airavata/wagtailapps/base/wagtail_hooks.py | 3 +-
setup.cfg | 11 +
93 files changed, 3361 insertions(+), 75739 deletions(-)