Merge branch '3-playlists' into 'develop'
Resolve "Playlists integration" Closes #3, #93, and #94 See merge request funkwhale/funkwhale!98
No related branches found
No related tags found
Showing
- api/config/settings/common.py 3 additions, 1 deletionapi/config/settings/common.py
- api/funkwhale_api/common/fields.py 27 additions, 0 deletionsapi/funkwhale_api/common/fields.py
- api/funkwhale_api/common/permissions.py 39 additions, 0 deletionsapi/funkwhale_api/common/permissions.py
- api/funkwhale_api/playlists/admin.py 2 additions, 2 deletionsapi/funkwhale_api/playlists/admin.py
- api/funkwhale_api/playlists/factories.py 10 additions, 0 deletionsapi/funkwhale_api/playlists/factories.py
- api/funkwhale_api/playlists/filters.py 22 additions, 0 deletionsapi/funkwhale_api/playlists/filters.py
- api/funkwhale_api/playlists/migrations/0001_initial.py 1 addition, 2 deletionsapi/funkwhale_api/playlists/migrations/0001_initial.py
- api/funkwhale_api/playlists/migrations/0002_auto_20180316_2217.py 22 additions, 0 deletions...whale_api/playlists/migrations/0002_auto_20180316_2217.py
- api/funkwhale_api/playlists/migrations/0003_auto_20180319_1214.py 52 additions, 0 deletions...whale_api/playlists/migrations/0003_auto_20180319_1214.py
- api/funkwhale_api/playlists/migrations/0004_auto_20180320_1713.py 27 additions, 0 deletions...whale_api/playlists/migrations/0004_auto_20180320_1713.py
- api/funkwhale_api/playlists/models.py 104 additions, 17 deletionsapi/funkwhale_api/playlists/models.py
- api/funkwhale_api/playlists/serializers.py 71 additions, 7 deletionsapi/funkwhale_api/playlists/serializers.py
- api/funkwhale_api/playlists/views.py 88 additions, 23 deletionsapi/funkwhale_api/playlists/views.py
- api/funkwhale_api/users/models.py 3 additions, 9 deletionsapi/funkwhale_api/users/models.py
- api/requirements/base.txt 0 additions, 1 deletionapi/requirements/base.txt
- api/setup.cfg 1 addition, 1 deletionapi/setup.cfg
- api/tests/common/test_fields.py 17 additions, 0 deletionsapi/tests/common/test_fields.py
- api/tests/common/test_permissions.py 42 additions, 0 deletionsapi/tests/common/test_permissions.py
- api/tests/conftest.py 13 additions, 0 deletionsapi/tests/conftest.py
- api/tests/playlists/test_models.py 126 additions, 0 deletionsapi/tests/playlists/test_models.py
Loading
Please register or sign in to comment