Merge branch 'master' into develop (e730ed45) · Commits · Creak / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

funkwhale
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

e730ed45

Unverified Commit e730ed45 authored 4 years ago by Agate

💬

Downloads
- Plain Diff

Merge branch 'master' into develop

parents fe0ed1f0 c8f9ac97

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/audio/filters.py 1 addition, 0 deletions

api/funkwhale_api/audio/filters.py
api/funkwhale_api/music/filters.py 64 additions, 0 deletions

api/funkwhale_api/music/filters.py
api/funkwhale_api/music/models.py 1 addition, 2 deletions

api/funkwhale_api/music/models.py
api/funkwhale_api/music/utils.py 12 additions, 6 deletions

api/funkwhale_api/music/utils.py
api/funkwhale_api/music/views.py 0 additions, 18 deletions

api/funkwhale_api/music/views.py
api/funkwhale_api/tags/filters.py 18 additions, 0 deletions

api/funkwhale_api/tags/filters.py
api/tests/music/test_filters.py 38 additions, 0 deletions

api/tests/music/test_filters.py
changes/changelog.d/1145.enhancement 1 addition, 0 deletions

changes/changelog.d/1145.enhancement
changes/changelog.d/1165.bugfix 1 addition, 0 deletions

changes/changelog.d/1165.bugfix
changes/changelog.d/api-related.enhancement 1 addition, 0 deletions

changes/changelog.d/api-related.enhancement

with 137 additions and 26 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment