Merge branch 'playlist-embed' into 'develop' (05e36c74) · Commits · funkwhale / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

funkwhale
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

05e36c74

Commit 05e36c74 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'playlist-embed' into 'develop'

Playlist embed

See merge request !878

parents 39f6f51e e1331301

No related branches found

No related tags found

1 merge request!878Playlist embed

Pipeline #5387 passed with stages

in 11 minutes and 1 second

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

api/config/spa_urls.py 5 additions, 0 deletions

api/config/spa_urls.py
api/funkwhale_api/music/serializers.py 33 additions, 0 deletions

api/funkwhale_api/music/serializers.py
api/funkwhale_api/music/spa_views.py 57 additions, 0 deletions

api/funkwhale_api/music/spa_views.py
api/tests/music/test_spa_views.py 74 additions, 0 deletions

api/tests/music/test_spa_views.py
api/tests/music/test_views.py 37 additions, 0 deletions

api/tests/music/test_views.py
changes/changelog.d/playlist-embed.enhancement 1 addition, 0 deletions

changes/changelog.d/playlist-embed.enhancement
front/src/EmbedFrame.vue 12 additions, 3 deletions

front/src/EmbedFrame.vue
front/src/components/audio/EmbedWizard.vue 1 addition, 1 deletion

front/src/components/audio/EmbedWizard.vue
front/src/views/playlists/Detail.vue 32 additions, 2 deletions

front/src/views/playlists/Detail.vue

with 252 additions and 6 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