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 2019/05/07 14:50:53 UTC
[airavata-django-portal] branch master updated (df0d479 -> 402d848)
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-django-portal.git.
from df0d479 AIRAVATA-3018 Clarifying why we can assume only one OWNER
new 8746086 task complete
new 5d3684d upload-user-files option
new e7231c9 removed ./idea
new 8bec3cc minor changes
new e273d38 "resolve merge conflicts"
new 95a24fe removed migration file from wagtailapps
new 243a341 "resolve merge conflicts"
new a964a22 task complete
new f687794 upload-user-files option
new 459ecba removed ./idea
new 49dd2b0 minor changes
new 1781f01 Merge branch 'upload-user-files'
new 28bec40 removed migration file from wagtailapps
new 5f9cb11 Rebase and resolve conflicts
new 3401d5b removed duplicate code
new 801faf9 removed migration file
new f15ced3 removed unused import,declarations
new bceee68 indentation changes
new ad86a8b indentation changes
new 450f0e0 changed import order
new 9bff65f Merge branch 'master' into master
new 402d848 Merge pull request #25 from Keerthi4308/master
The 823 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 | 1 +
django_airavata/apps/api/datastore.py | 36 ++++++
django_airavata/apps/api/urls.py | 3 +
django_airavata/apps/api/views.py | 59 +++++++++
.../{auth => workspace}/migrations/0001_initial.py | 11 +-
django_airavata/apps/workspace/models.py | 8 ++
.../js/components/experiment/ExperimentEditor.vue | 10 +-
.../input-editors/InputEditorContainer.vue | 4 +
.../input-editors/UserFileInputEditor.vue | 37 ++++++
.../js/components/project/AddFileButton.vue | 136 +++++++++++++++++++++
.../js/containers/ProjectListContainer.vue | 4 +
11 files changed, 300 insertions(+), 9 deletions(-)
copy django_airavata/apps/{auth => workspace}/migrations/0001_initial.py (50%)
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/UserFileInputEditor.vue
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/project/AddFileButton.vue