Merge branch 'release/0.15'
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .gitlab-ci.yml 87 additions, 1 deletion.gitlab-ci.yml
- CHANGELOG 77 additions, 0 deletionsCHANGELOG
- CONTRIBUTING 37 additions, 1 deletionCONTRIBUTING
- api/config/settings/common.py 5 additions, 0 deletionsapi/config/settings/common.py
- api/funkwhale_api/__init__.py 1 addition, 1 deletionapi/funkwhale_api/__init__.py
- api/funkwhale_api/common/fields.py 3 additions, 3 deletionsapi/funkwhale_api/common/fields.py
- api/funkwhale_api/common/serializers.py 27 additions, 17 deletionsapi/funkwhale_api/common/serializers.py
- api/funkwhale_api/federation/serializers.py 1 addition, 1 deletionapi/funkwhale_api/federation/serializers.py
- api/funkwhale_api/manage/filters.py 44 additions, 1 deletionapi/funkwhale_api/manage/filters.py
- api/funkwhale_api/manage/serializers.py 168 additions, 2 deletionsapi/funkwhale_api/manage/serializers.py
- api/funkwhale_api/manage/urls.py 12 additions, 1 deletionapi/funkwhale_api/manage/urls.py
- api/funkwhale_api/manage/views.py 84 additions, 4 deletionsapi/funkwhale_api/manage/views.py
- api/funkwhale_api/music/factories.py 1 addition, 0 deletionsapi/funkwhale_api/music/factories.py
- api/funkwhale_api/music/migrations/0028_importjob_replace_if_duplicate.py 18 additions, 0 deletions...i/music/migrations/0028_importjob_replace_if_duplicate.py
- api/funkwhale_api/music/models.py 2 additions, 1 deletionapi/funkwhale_api/music/models.py
- api/funkwhale_api/music/tasks.py 7 additions, 6 deletionsapi/funkwhale_api/music/tasks.py
- api/funkwhale_api/playlists/views.py 3 additions, 1 deletionapi/funkwhale_api/playlists/views.py
- api/funkwhale_api/providers/audiofile/management/commands/import_files.py 33 additions, 10 deletions...i/providers/audiofile/management/commands/import_files.py
- api/funkwhale_api/users/admin.py 14 additions, 6 deletionsapi/funkwhale_api/users/admin.py
Loading
Please register or sign in to comment