Merge branch 'feature/50-browsing' into 'develop' (e1817cc5) · Commits · wxcafé / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

e1817cc5

Commit e1817cc5 authored 7 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'feature/50-browsing' into 'develop'

Feature/50 browsing

Closes #50

See merge request funkwhale/funkwhale!32

parents 860b6b1e f3c91477

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 2 additions, 0 deletions

CHANGELOG
api/config/urls.py 6 additions, 0 deletions

api/config/urls.py
api/funkwhale_api/music/filters.py 1 addition, 1 deletion

api/funkwhale_api/music/filters.py
api/funkwhale_api/music/serializers.py 2 additions, 2 deletions

api/funkwhale_api/music/serializers.py
api/funkwhale_api/music/views.py 8 additions, 4 deletions

api/funkwhale_api/music/views.py
front/src/App.vue 1 addition, 1 deletion

front/src/App.vue
front/src/components/favorites/List.vue 70 additions, 6 deletions

front/src/components/favorites/List.vue
front/src/components/library/Artists.vue 87 additions, 11 deletions

front/src/components/library/Artists.vue
front/src/components/library/Library.vue 1 addition, 1 deletion

front/src/components/library/Library.vue
front/src/components/mixins/Ordering.vue 26 additions, 0 deletions

front/src/components/mixins/Ordering.vue
front/src/components/mixins/Pagination.vue 8 additions, 0 deletions

front/src/components/mixins/Pagination.vue
front/src/router/index.js 16 additions, 2 deletions

front/src/router/index.js

with 228 additions and 28 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