Merge branch '152-permissions' into 'develop'
Resolve "Permission management overhaul" Closes #152 See merge request funkwhale/funkwhale!201
No related branches found
No related tags found
Showing
- api/funkwhale_api/common/management/__init__.py 0 additions, 0 deletionsapi/funkwhale_api/common/management/__init__.py
- api/funkwhale_api/common/management/commands/__init__.py 0 additions, 0 deletionsapi/funkwhale_api/common/management/commands/__init__.py
- api/funkwhale_api/common/management/commands/script.py 66 additions, 0 deletionsapi/funkwhale_api/common/management/commands/script.py
- api/funkwhale_api/common/permissions.py 1 addition, 12 deletionsapi/funkwhale_api/common/permissions.py
- api/funkwhale_api/common/scripts/__init__.py 2 additions, 0 deletionsapi/funkwhale_api/common/scripts/__init__.py
- api/funkwhale_api/common/scripts/django_permissions_to_user_permissions.py 29 additions, 0 deletions.../common/scripts/django_permissions_to_user_permissions.py
- api/funkwhale_api/common/scripts/test.py 8 additions, 0 deletionsapi/funkwhale_api/common/scripts/test.py
- api/funkwhale_api/federation/views.py 5 additions, 7 deletionsapi/funkwhale_api/federation/views.py
- api/funkwhale_api/instance/views.py 3 additions, 1 deletionapi/funkwhale_api/instance/views.py
- api/funkwhale_api/music/views.py 8 additions, 10 deletionsapi/funkwhale_api/music/views.py
- api/funkwhale_api/users/admin.py 27 additions, 1 deletionapi/funkwhale_api/users/admin.py
- api/funkwhale_api/users/factories.py 27 additions, 1 deletionapi/funkwhale_api/users/factories.py
- api/funkwhale_api/users/migrations/0006_auto_20180517_2324.py 28 additions, 0 deletions...funkwhale_api/users/migrations/0006_auto_20180517_2324.py
- api/funkwhale_api/users/models.py 30 additions, 17 deletionsapi/funkwhale_api/users/models.py
- api/funkwhale_api/users/permissions.py 19 additions, 0 deletionsapi/funkwhale_api/users/permissions.py
- api/funkwhale_api/users/serializers.py 2 additions, 7 deletionsapi/funkwhale_api/users/serializers.py
- api/tests/common/test_scripts.py 56 additions, 0 deletionsapi/tests/common/test_scripts.py
- api/tests/conftest.py 9 additions, 0 deletionsapi/tests/conftest.py
- api/tests/federation/test_views.py 9 additions, 0 deletionsapi/tests/federation/test_views.py
- api/tests/instance/test_views.py 13 additions, 1 deletionapi/tests/instance/test_views.py
Loading
Please register or sign in to comment