Merge branch 'master' into GREG-60_registration_steps
Showing
- frontend/package-lock.json 16 additions, 16 deletionsfrontend/package-lock.json
- frontend/public/locales/en/common.json 17 additions, 0 deletionsfrontend/public/locales/en/common.json
- frontend/public/locales/nb/common.json 17 additions, 0 deletionsfrontend/public/locales/nb/common.json
- frontend/public/locales/nn/common.json 17 additions, 0 deletionsfrontend/public/locales/nn/common.json
- frontend/src/hooks/useOus/index.tsx 28 additions, 0 deletionsfrontend/src/hooks/useOus/index.tsx
- frontend/src/routes/register/index.tsx 112 additions, 53 deletionsfrontend/src/routes/register/index.tsx
- frontend/src/routes/sponsor/frontpage/index.tsx 176 additions, 6 deletionsfrontend/src/routes/sponsor/frontpage/index.tsx
- greg/migrations/0007_alter_organizationalunit_parent.py 19 additions, 0 deletionsgreg/migrations/0007_alter_organizationalunit_parent.py
- greg/models.py 1 addition, 1 deletiongreg/models.py
- greg/permissions.py 12 additions, 0 deletionsgreg/permissions.py
- gregsite/settings/dev.py 5 additions, 4 deletionsgregsite/settings/dev.py
- gregui/urls.py 3 additions, 1 deletiongregui/urls.py
- gregui/views.py 51 additions, 1 deletiongregui/views.py
Loading
Please register or sign in to comment