Merge branch 'master' into develop
Showing
- .gitlab-ci.yml 1 addition, 1 deletion.gitlab-ci.yml
- api/funkwhale_api/common/filters.py 49 additions, 22 deletionsapi/funkwhale_api/common/filters.py
- api/funkwhale_api/music/filters.py 3 additions, 1 deletionapi/funkwhale_api/music/filters.py
- api/funkwhale_api/music/serializers.py 3 additions, 0 deletionsapi/funkwhale_api/music/serializers.py
- api/funkwhale_api/music/views.py 5 additions, 4 deletionsapi/funkwhale_api/music/views.py
- api/tests/common/test_filters.py 17 additions, 4 deletionsapi/tests/common/test_filters.py
- changes/changelog.d/1116.enhancement 1 addition, 0 deletionschanges/changelog.d/1116.enhancement
- changes/changelog.d/1175.bugfix 1 addition, 0 deletionschanges/changelog.d/1175.bugfix
- docs/api/parameters.yml 5 additions, 0 deletionsdocs/api/parameters.yml
- front/src/EmbedFrame.vue 1 addition, 0 deletionsfront/src/EmbedFrame.vue
- front/src/components/library/AlbumDropdown.vue 1 addition, 1 deletionfront/src/components/library/AlbumDropdown.vue
- front/src/components/library/ArtistBase.vue 1 addition, 1 deletionfront/src/components/library/ArtistBase.vue
- front/src/components/library/TrackBase.vue 1 addition, 1 deletionfront/src/components/library/TrackBase.vue
- front/src/views/channels/DetailBase.vue 1 addition, 1 deletionfront/src/views/channels/DetailBase.vue
- front/src/views/playlists/Detail.vue 1 addition, 1 deletionfront/src/views/playlists/Detail.vue
Loading
Please register or sign in to comment