Merge branch 'GREG-62-invitations' into 'master'
Add invitations See merge request !85
Showing
- frontend/src/contexts/userContext.ts 3 additions, 2 deletionsfrontend/src/contexts/userContext.ts
- frontend/src/providers/userProvider.tsx 11 additions, 3 deletionsfrontend/src/providers/userProvider.tsx
- frontend/src/routes/components/userInfo.tsx 5 additions, 1 deletionfrontend/src/routes/components/userInfo.tsx
- frontend/src/routes/frontpage/index.tsx 3 additions, 1 deletionfrontend/src/routes/frontpage/index.tsx
- frontend/src/routes/index.tsx 7 additions, 4 deletionsfrontend/src/routes/index.tsx
- frontend/src/routes/invite/index.tsx 18 additions, 0 deletionsfrontend/src/routes/invite/index.tsx
- frontend/src/routes/invitelink/index.tsx 18 additions, 0 deletionsfrontend/src/routes/invitelink/index.tsx
- frontend/src/routes/sponsor/frontpage/index.tsx 1 addition, 1 deletionfrontend/src/routes/sponsor/frontpage/index.tsx
- greg/admin.py 13 additions, 0 deletionsgreg/admin.py
- greg/api/serializers/person.py 0 additions, 1 deletiongreg/api/serializers/person.py
- greg/migrations/0008_add_invitations.py 48 additions, 0 deletionsgreg/migrations/0008_add_invitations.py
- greg/models.py 27 additions, 1 deletiongreg/models.py
- gregsite/settings/dev.py 5 additions, 6 deletionsgregsite/settings/dev.py
- gregui/api/serializers/invitation.py 40 additions, 0 deletionsgregui/api/serializers/invitation.py
- gregui/api/serializers/role.py 17 additions, 0 deletionsgregui/api/serializers/role.py
- gregui/api/urls.py 9 additions, 1 deletiongregui/api/urls.py
- gregui/api/views/invitation.py 200 additions, 0 deletionsgregui/api/views/invitation.py
- gregui/api/views/userinfo.py 103 additions, 16 deletionsgregui/api/views/userinfo.py
- gregui/urls.py 2 additions, 3 deletionsgregui/urls.py
- gregui/views.py 2 additions, 53 deletionsgregui/views.py
Loading
Please register or sign in to comment