Merge branch 'master' into GREG-94_resend_invitation
Showing
- README.md 8 additions, 0 deletionsREADME.md
- frontend/public/locales/en/common.json 5 additions, 2 deletionsfrontend/public/locales/en/common.json
- frontend/public/locales/nb/common.json 5 additions, 2 deletionsfrontend/public/locales/nb/common.json
- frontend/public/locales/nn/common.json 5 additions, 2 deletionsfrontend/public/locales/nn/common.json
- frontend/src/routes/sponsor/frontpage/index.tsx 5 additions, 3 deletionsfrontend/src/routes/sponsor/frontpage/index.tsx
- frontend/src/routes/sponsor/register/formData.ts 1 addition, 0 deletionsfrontend/src/routes/sponsor/register/formData.ts
- frontend/src/routes/sponsor/register/stepPersonForm.tsx 27 additions, 1 deletionfrontend/src/routes/sponsor/register/stepPersonForm.tsx
- frontend/src/routes/sponsor/register/stepRegistration.tsx 1 addition, 0 deletionsfrontend/src/routes/sponsor/register/stepRegistration.tsx
- greg/management/commands/import_from_orgreg.py 70 additions, 0 deletionsgreg/management/commands/import_from_orgreg.py
- greg/models.py 8 additions, 0 deletionsgreg/models.py
- greg/tests/populate_fixtures.py 343 additions, 0 deletionsgreg/tests/populate_fixtures.py
- gregsite/settings/base.py 16 additions, 1 deletiongregsite/settings/base.py
- gregsite/settings/dev.py 8 additions, 0 deletionsgregsite/settings/dev.py
- gregsite/settings/prod.py 7 additions, 0 deletionsgregsite/settings/prod.py
- gregui/api/serializers/guest.py 23 additions, 1 deletiongregui/api/serializers/guest.py
- gregui/api/views/invitation.py 2 additions, 0 deletionsgregui/api/views/invitation.py
- gregui/tests/api/test_invitation.py 29 additions, 0 deletionsgregui/tests/api/test_invitation.py
- gregui/tests/api/test_invite_guest.py 20 additions, 10 deletionsgregui/tests/api/test_invite_guest.py
Loading
Please register or sign in to comment