Merge branch 'serve-from-s3' into 'develop' (94d080c3) · 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

94d080c3

Commit 94d080c3 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'serve-from-s3' into 'develop'

Serve from s3

See merge request funkwhale/funkwhale!759

parents bdc97803 86269c1b

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

api/config/settings/common.py 7 additions, 2 deletions

api/config/settings/common.py
api/funkwhale_api/music/views.py 11 additions, 2 deletions

api/funkwhale_api/music/views.py
api/funkwhale_api/subsonic/views.py 7 additions, 1 deletion

api/funkwhale_api/subsonic/views.py
api/tests/music/test_views.py 35 additions, 7 deletions

api/tests/music/test_views.py
api/tests/subsonic/test_views.py 21 additions, 4 deletions

api/tests/subsonic/test_views.py
docs/admin/external-storages.rst 20 additions, 0 deletions

docs/admin/external-storages.rst
front/src/components/audio/Player.vue 3 additions, 2 deletions

front/src/components/audio/Player.vue

with 104 additions and 18 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