Merge branch '153-in-place-import' into 'develop'
Resolve "Allow in-place import" Closes #153 See merge request funkwhale/funkwhale!150
Showing
- .env.dev 1 addition, 0 deletions.env.dev
- CHANGELOG 46 additions, 0 deletionsCHANGELOG
- api/config/settings/common.py 6 additions, 0 deletionsapi/config/settings/common.py
- api/funkwhale_api/music/factories.py 8 additions, 0 deletionsapi/funkwhale_api/music/factories.py
- api/funkwhale_api/music/models.py 20 additions, 0 deletionsapi/funkwhale_api/music/models.py
- api/funkwhale_api/music/tasks.py 8 additions, 4 deletionsapi/funkwhale_api/music/tasks.py
- api/funkwhale_api/music/views.py 12 additions, 3 deletionsapi/funkwhale_api/music/views.py
- api/funkwhale_api/providers/audiofile/management/commands/import_files.py 39 additions, 9 deletions...i/providers/audiofile/management/commands/import_files.py
- api/tests/music/test_import.py 12 additions, 0 deletionsapi/tests/music/test_import.py
- api/tests/music/test_views.py 19 additions, 0 deletionsapi/tests/music/test_views.py
- api/tests/test_import_audio_file.py 35 additions, 0 deletionsapi/tests/test_import_audio_file.py
- changes/changelog.d/153.feature 1 addition, 0 deletionschanges/changelog.d/153.feature
- deploy/env.prod.sample 17 additions, 3 deletionsdeploy/env.prod.sample
- deploy/nginx.conf 8 additions, 0 deletionsdeploy/nginx.conf
- dev.yml 3 additions, 2 deletionsdev.yml
- docker/nginx/conf.dev 4 additions, 0 deletionsdocker/nginx/conf.dev
- docs/configuration.rst 41 additions, 0 deletionsdocs/configuration.rst
- docs/importing-music.rst 38 additions, 10 deletionsdocs/importing-music.rst
Loading
Please register or sign in to comment