Merge branch '432-tags-radio' into 'develop' (9376f808) · 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

9376f808

Commit 9376f808 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch '432-tags-radio' into 'develop'

See #432: tags radio and search

See merge request funkwhale/funkwhale!834

parents f6329af2 34d600d9

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/music/views.py 5 additions, 11 deletions

api/funkwhale_api/music/views.py
api/funkwhale_api/radios/filters.py 7 additions, 3 deletions

api/funkwhale_api/radios/filters.py
api/funkwhale_api/radios/radios.py 18 additions, 1 deletion

api/funkwhale_api/radios/radios.py
api/funkwhale_api/radios/serializers.py 22 additions, 1 deletion

api/funkwhale_api/radios/serializers.py
api/tests/radios/test_radios.py 7 additions, 4 deletions

api/tests/radios/test_radios.py
api/tests/radios/test_serializers.py 44 additions, 0 deletions

api/tests/radios/test_serializers.py
front/src/components/audio/SearchBar.vue 27 additions, 2 deletions

front/src/components/audio/SearchBar.vue
front/src/components/library/TagDetail.vue 3 additions, 1 deletion

front/src/components/library/TagDetail.vue
front/src/components/radios/Button.vue 1 addition, 1 deletion

front/src/components/radios/Button.vue

with 134 additions and 24 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