Merge branch '230-upload-permission' into 'develop' (79844c6a) · Commits · Paul Walko / 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

79844c6a

Commit 79844c6a authored 6 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch '230-upload-permission' into 'develop'

Resolve "Split library management and upload permission"

Closes #230

See merge request funkwhale/funkwhale!212

parents 9c02954e 0314f786

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/music/views.py 22 additions, 2 deletions

api/funkwhale_api/music/views.py
api/funkwhale_api/users/admin.py 1 addition, 0 deletions

api/funkwhale_api/users/admin.py
api/funkwhale_api/users/migrations/0007_auto_20180524_2009.py 33 additions, 0 deletions

...funkwhale_api/users/migrations/0007_auto_20180524_2009.py
api/funkwhale_api/users/models.py 10 additions, 3 deletions

api/funkwhale_api/users/models.py
api/funkwhale_api/users/permissions.py 3 additions, 1 deletion

api/funkwhale_api/users/permissions.py
api/tests/conftest.py 2 additions, 1 deletion

api/tests/conftest.py
api/tests/music/test_views.py 29 additions, 5 deletions

api/tests/music/test_views.py
api/tests/users/test_models.py 13 additions, 2 deletions

api/tests/users/test_models.py
api/tests/users/test_permissions.py 27 additions, 1 deletion

api/tests/users/test_permissions.py
changes/changelog.d/230.enhancement 22 additions, 0 deletions

changes/changelog.d/230.enhancement
front/src/components/Sidebar.vue 8 additions, 1 deletion

front/src/components/Sidebar.vue
front/src/components/library/Library.vue 7 additions, 3 deletions

front/src/components/library/Library.vue

with 177 additions and 19 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