Merge branch 'GREG-332' into 'master'
Add ability for sponsors to reject a guest's registration See merge request !412
No related branches found
No related tags found
Showing
- frontend/public/locales/en/common.json 11 additions, 1 deletionfrontend/public/locales/en/common.json
- frontend/public/locales/nb/common.json 11 additions, 1 deletionfrontend/public/locales/nb/common.json
- frontend/public/locales/nn/common.json 11 additions, 1 deletionfrontend/public/locales/nn/common.json
- frontend/src/components/identityLine/index.tsx 56 additions, 4 deletionsfrontend/src/components/identityLine/index.tsx
- frontend/src/interfaces/index.ts 3 additions, 1 deletionfrontend/src/interfaces/index.ts
- frontend/src/routes/sponsor/guest/guestInfo/index.tsx 11 additions, 0 deletionsfrontend/src/routes/sponsor/guest/guestInfo/index.tsx
- frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx 1 addition, 0 deletionsfrontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
- frontend/src/utils/index.ts 1 addition, 0 deletionsfrontend/src/utils/index.ts
- greg/models.py 2 additions, 2 deletionsgreg/models.py
- greg/utils.py 6 additions, 2 deletionsgreg/utils.py
- gregui/api/serializers/role.py 6 additions, 1 deletiongregui/api/serializers/role.py
- gregui/api/urls.py 7 additions, 1 deletiongregui/api/urls.py
- gregui/api/views/invitation.py 67 additions, 1 deletiongregui/api/views/invitation.py
- gregui/api/views/person.py 1 addition, 0 deletionsgregui/api/views/person.py
- gregui/api/views/userinfo.py 3 additions, 0 deletionsgregui/api/views/userinfo.py
- gregui/mailutils/invite_guest.py 14 additions, 1 deletiongregui/mailutils/invite_guest.py
- gregui/migrations/0005_alter_emailtemplate_template_key.py 27 additions, 0 deletionsgregui/migrations/0005_alter_emailtemplate_template_key.py
- gregui/models.py 2 additions, 0 deletionsgregui/models.py
- gregui/templates/guest_redo_registration.txt 7 additions, 0 deletionsgregui/templates/guest_redo_registration.txt
- gregui/tests/api/serializers/test_guest.py 1 addition, 0 deletionsgregui/tests/api/serializers/test_guest.py
Loading
Please register or sign in to comment