Artyom Kravchenko 919e49ec45 resolve conflicts

2021-04-13 15:14:20 +03:00

..

layout/base

Added base.html layout

2021-02-07 15:10:45 +03:00

migrations

Fixed custom_role_id change for work page

2021-04-10 21:28:29 +03:00

templates

Control page displays all users from zendesk and db

2021-04-11 17:35:42 +03:00

__init__.py

Initial commit. Add django.

2021-02-04 20:01:35 +03:00

admin.py

Initial commit. Add django.

2021-02-04 20:01:35 +03:00

apiauth.py

Add apiauth and serializers docs

2021-03-23 20:55:30 +03:00

apps.py

Initial commit. Add django.

2021-02-04 20:01:35 +03:00

extra_func.py

Merge branch 'feature/periodic_upgrade' into 'develop'

2021-04-13 12:01:29 +00:00

forms.py

small refactoring

2021-03-29 22:37:18 +03:00

models.py

Fix user role display. Migrate to displayable roles, defined in settings.ZENDESK_ROLES

2021-04-01 20:46:07 +03:00

serializers.py

Control page displays all users from zendesk and db

2021-04-11 17:35:42 +03:00

tests.py

Initial commit. Add django.

2021-02-04 20:01:35 +03:00

urls.py

Added Django REST but have some bugs

2021-03-07 21:30:02 +03:00

views.py

resolve conflicts

2021-04-13 15:14:20 +03:00