Merge branch 'master' into GREG-169_add_missing_redirect
Showing
- frontend/src/routes/components/logos/index.tsx 2 additions, 2 deletionsfrontend/src/routes/components/logos/index.tsx
- frontend/src/routes/invite/index.tsx 10 additions, 13 deletionsfrontend/src/routes/invite/index.tsx
- frontend/src/routes/sponsor/register/frontPage.tsx 4 additions, 1 deletionfrontend/src/routes/sponsor/register/frontPage.tsx
- greg/api/serializers/person.py 1 addition, 11 deletionsgreg/api/serializers/person.py
- greg/management/commands/role_end_notifier.py 31 additions, 0 deletionsgreg/management/commands/role_end_notifier.py
- greg/tasks.py 57 additions, 0 deletionsgreg/tasks.py
- greg/tests/conftest.py 23 additions, 1 deletiongreg/tests/conftest.py
- greg/tests/test_tasks.py 41 additions, 0 deletionsgreg/tests/test_tasks.py
- gregsite/settings/base.py 7 additions, 0 deletionsgregsite/settings/base.py
- gregui/api/urls.py 2 additions, 2 deletionsgregui/api/urls.py
- gregui/api/views/person.py 76 additions, 10 deletionsgregui/api/views/person.py
- gregui/mailutils.py 13 additions, 0 deletionsgregui/mailutils.py
- gregui/migrations/0003_add_email_template_type.py 26 additions, 0 deletionsgregui/migrations/0003_add_email_template_type.py
- gregui/models.py 5 additions, 0 deletionsgregui/models.py
- gregui/tests/api/views/test_search.py 131 additions, 0 deletionsgregui/tests/api/views/test_search.py
- gregui/tests/conftest.py 5 additions, 3 deletionsgregui/tests/conftest.py
Loading
Please register or sign in to comment