Merge branch '272-transcoding' into 'develop'
Fix #272 and #586 Closes #272 and #586 See merge request funkwhale/funkwhale!458
No related branches found
No related tags found
Showing
- api/config/settings/common.py 6 additions, 1 deletionapi/config/settings/common.py
- api/funkwhale_api/common/search.py 1 addition, 1 deletionapi/funkwhale_api/common/search.py
- api/funkwhale_api/favorites/views.py 1 addition, 1 deletionapi/funkwhale_api/favorites/views.py
- api/funkwhale_api/history/views.py 1 addition, 1 deletionapi/funkwhale_api/history/views.py
- api/funkwhale_api/music/admin.py 22 additions, 0 deletionsapi/funkwhale_api/music/admin.py
- api/funkwhale_api/music/dynamic_preferences_registry.py 34 additions, 0 deletionsapi/funkwhale_api/music/dynamic_preferences_registry.py
- api/funkwhale_api/music/factories.py 12 additions, 0 deletionsapi/funkwhale_api/music/factories.py
- api/funkwhale_api/music/migrations/0033_auto_20181023_1837.py 53 additions, 0 deletions...funkwhale_api/music/migrations/0033_auto_20181023_1837.py
- api/funkwhale_api/music/models.py 71 additions, 17 deletionsapi/funkwhale_api/music/models.py
- api/funkwhale_api/music/serializers.py 27 additions, 47 deletionsapi/funkwhale_api/music/serializers.py
- api/funkwhale_api/music/tasks.py 18 additions, 1 deletionapi/funkwhale_api/music/tasks.py
- api/funkwhale_api/music/utils.py 8 additions, 0 deletionsapi/funkwhale_api/music/utils.py
- api/funkwhale_api/music/views.py 40 additions, 27 deletionsapi/funkwhale_api/music/views.py
- api/funkwhale_api/playlists/models.py 10 additions, 11 deletionsapi/funkwhale_api/playlists/models.py
- api/funkwhale_api/playlists/serializers.py 1 addition, 1 deletionapi/funkwhale_api/playlists/serializers.py
- api/funkwhale_api/playlists/views.py 1 addition, 1 deletionapi/funkwhale_api/playlists/views.py
- api/funkwhale_api/subsonic/views.py 6 additions, 1 deletionapi/funkwhale_api/subsonic/views.py
- api/requirements/base.txt 1 addition, 0 deletionsapi/requirements/base.txt
- api/tests/favorites/test_favorites.py 0 additions, 1 deletionapi/tests/favorites/test_favorites.py
- api/tests/music/test_models.py 0 additions, 18 deletionsapi/tests/music/test_models.py
Loading
Please register or sign in to comment