Merge branch '106-web-upload' into 'develop' (7db01394) · Commits · Zwordi / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

funkwhale
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

7db01394

Commit 7db01394 authored 6 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch '106-web-upload' into 'develop'

Resolve "File import is broken"

Closes #106 and #213

See merge request funkwhale/funkwhale!204

parents 28236ef7 0c1a2b76

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/music/tasks.py 9 additions, 6 deletions

api/funkwhale_api/music/tasks.py
api/funkwhale_api/providers/audiofile/management/commands/import_files.py 1 addition, 9 deletions

...i/providers/audiofile/management/commands/import_files.py
api/tests/music/test_tasks.py 12 additions, 36 deletions

api/tests/music/test_tasks.py
api/tests/test_import_audio_file.py 0 additions, 24 deletions

api/tests/test_import_audio_file.py
changes/changelog.d/106.bugfix 1 addition, 0 deletions

changes/changelog.d/106.bugfix
changes/changelog.d/213.bugfix 9 additions, 0 deletions

changes/changelog.d/213.bugfix
changes/changelog.d/acoustid.misc 1 addition, 0 deletions

changes/changelog.d/acoustid.misc
docker/nginx/conf.dev 1 addition, 1 deletion

docker/nginx/conf.dev
docs/importing-music.rst 3 additions, 7 deletions

docs/importing-music.rst
front/src/components/library/import/FileUpload.vue 11 additions, 3 deletions

front/src/components/library/import/FileUpload.vue
front/src/components/library/import/Main.vue 24 additions, 2 deletions

front/src/components/library/import/Main.vue
front/src/views/admin/Settings.vue 1 addition, 2 deletions

front/src/views/admin/Settings.vue

with 73 additions and 90 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment