Merge branch '248-invite' into 'develop'
Resolve "Invite system" Closes #248 See merge request funkwhale/funkwhale!263
Showing
- api/config/settings/common.py 4 additions, 0 deletionsapi/config/settings/common.py
- api/funkwhale_api/common/serializers.py 25 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 14 additions, 1 deletionapi/funkwhale_api/manage/filters.py
- api/funkwhale_api/manage/serializers.py 47 additions, 2 deletionsapi/funkwhale_api/manage/serializers.py
- api/funkwhale_api/manage/urls.py 1 addition, 0 deletionsapi/funkwhale_api/manage/urls.py
- api/funkwhale_api/manage/views.py 34 additions, 0 deletionsapi/funkwhale_api/manage/views.py
- api/funkwhale_api/users/admin.py 14 additions, 6 deletionsapi/funkwhale_api/users/admin.py
- api/funkwhale_api/users/factories.py 15 additions, 0 deletionsapi/funkwhale_api/users/factories.py
- api/funkwhale_api/users/migrations/0009_auto_20180619_2024.py 31 additions, 0 deletions...funkwhale_api/users/migrations/0009_auto_20180619_2024.py
- api/funkwhale_api/users/models.py 47 additions, 0 deletionsapi/funkwhale_api/users/models.py
- api/funkwhale_api/users/serializers.py 23 additions, 0 deletionsapi/funkwhale_api/users/serializers.py
- api/funkwhale_api/users/views.py 4 additions, 1 deletionapi/funkwhale_api/users/views.py
- api/tests/common/test_serializers.py 26 additions, 11 deletionsapi/tests/common/test_serializers.py
- api/tests/manage/test_views.py 21 additions, 0 deletionsapi/tests/manage/test_views.py
- api/tests/users/test_models.py 32 additions, 0 deletionsapi/tests/users/test_models.py
- api/tests/users/test_views.py 33 additions, 0 deletionsapi/tests/users/test_views.py
- front/src/components/Sidebar.vue 1 addition, 1 deletionfront/src/components/Sidebar.vue
- front/src/components/auth/Signup.vue 27 additions, 13 deletionsfront/src/components/auth/Signup.vue
- front/src/components/common/ActionTable.vue 2 additions, 1 deletionfront/src/components/common/ActionTable.vue
Loading
Please register or sign in to comment