Merge branch 'master' into develop
No related branches found
No related tags found
Showing
- api/config/settings/common.py 3 additions, 1 deletionapi/config/settings/common.py
- api/config/settings/local.py 16 additions, 0 deletionsapi/config/settings/local.py
- api/funkwhale_api/federation/factories.py 3 additions, 0 deletionsapi/funkwhale_api/federation/factories.py
- api/funkwhale_api/federation/models.py 40 additions, 0 deletionsapi/funkwhale_api/federation/models.py
- api/funkwhale_api/music/management/commands/rebuild_music_permissions.py 59 additions, 0 deletions...pi/music/management/commands/rebuild_music_permissions.py
- api/funkwhale_api/music/migrations/0040_auto_20191021_1318.py 32 additions, 0 deletions...funkwhale_api/music/migrations/0040_auto_20191021_1318.py
- api/funkwhale_api/music/migrations/0041_auto_20191021_1705.py 47 additions, 0 deletions...funkwhale_api/music/migrations/0041_auto_20191021_1705.py
- api/funkwhale_api/music/migrations/0042_denormalize_audio_permissions.py.bak 40 additions, 0 deletions...usic/migrations/0042_denormalize_audio_permissions.py.bak
- api/funkwhale_api/music/models.py 140 additions, 7 deletionsapi/funkwhale_api/music/models.py
- api/funkwhale_api/music/tasks.py 8 additions, 1 deletionapi/funkwhale_api/music/tasks.py
- api/funkwhale_api/music/views.py 14 additions, 11 deletionsapi/funkwhale_api/music/views.py
- api/funkwhale_api/subsonic/views.py 7 additions, 1 deletionapi/funkwhale_api/subsonic/views.py
- api/requirements/local.txt 1 addition, 0 deletionsapi/requirements/local.txt
- api/setup.cfg 1 addition, 0 deletionsapi/setup.cfg
- api/tests/federation/test_models.py 81 additions, 0 deletionsapi/tests/federation/test_models.py
- api/tests/loadtesting/library.py 38 additions, 0 deletionsapi/tests/loadtesting/library.py
- api/tests/music/test_models.py 153 additions, 14 deletionsapi/tests/music/test_models.py
- api/tests/music/test_tasks.py 8 additions, 0 deletionsapi/tests/music/test_tasks.py
- api/tests/subsonic/test_views.py 17 additions, 0 deletionsapi/tests/subsonic/test_views.py
- changes/changelog.d/954.bugfix 1 addition, 0 deletionschanges/changelog.d/954.bugfix
Loading
Please register or sign in to comment