Merge branch 'master' into 'oidc-tests'
# Conflicts: # gregui/tests/conftest.py
No related branches found
No related tags found
Checking pipeline status
Showing
- .pylintrc 1 addition, 0 deletions.pylintrc
- frontend/src/themes/index.test.ts 39 additions, 0 deletionsfrontend/src/themes/index.test.ts
- frontend/src/utils/index.test.ts 52 additions, 1 deletionfrontend/src/utils/index.test.ts
- frontend/src/utils/index.ts 2 additions, 2 deletionsfrontend/src/utils/index.ts
- greg/api/filters.py 8 additions, 3 deletionsgreg/api/filters.py
- greg/api/serializers/person.py 0 additions, 5 deletionsgreg/api/serializers/person.py
- greg/api/urls.py 5 additions, 6 deletionsgreg/api/urls.py
- greg/managers.py 36 additions, 0 deletionsgreg/managers.py
- greg/migrations/0009_email_mobile_to_identity.py 65 additions, 0 deletionsgreg/migrations/0009_email_mobile_to_identity.py
- greg/models.py 22 additions, 6 deletionsgreg/models.py
- greg/tests/api/test_person.py 34 additions, 29 deletionsgreg/tests/api/test_person.py
- greg/tests/conftest.py 43 additions, 26 deletionsgreg/tests/conftest.py
- greg/tests/models/test_identity.py 1 addition, 1 deletiongreg/tests/models/test_identity.py
- greg/tests/models/test_person.py 25 additions, 9 deletionsgreg/tests/models/test_person.py
- greg/tests/test_signals.py 2 additions, 2 deletionsgreg/tests/test_signals.py
- greg/urls.py 2 additions, 2 deletionsgreg/urls.py
- gregui/api/serializers/guest.py 14 additions, 4 deletionsgregui/api/serializers/guest.py
- gregui/api/serializers/invitation.py 19 additions, 3 deletionsgregui/api/serializers/invitation.py
- gregui/api/urls.py 3 additions, 5 deletionsgregui/api/urls.py
- gregui/api/views/guest.py 0 additions, 11 deletionsgregui/api/views/guest.py
Loading
Please register or sign in to comment