Artyom Kravchenko
870cbca99c
tmp commit
2021-04-06 18:04:13 +03:00
Artyom Kravchenko
b3db81203f
add daphne to requirements
2021-04-05 14:53:47 +03:00
Кравченко Артем
575577642c
Merge branch 'hotfix/fix_user_role_name' into 'develop'
...
Fix user role display. Migrate to displayable roles, defined in settings.ZENDESK_ROLES
See merge request 2020-2021/online/s101/group-02/access_controller!47
2021-04-01 17:47:27 +00:00
Andrew Smirnov
3aaae33c44
Fix user role display. Migrate to displayable roles, defined in settings.ZENDESK_ROLES
2021-04-01 20:46:07 +03:00
685fe35821
Merge branch 'feature/fix_work_page_css' into 'develop'
...
#44 | Исправить Метку Выбора в Таблице Выбора Пользователей для Управления Правами
See merge request 2020-2021/online/s101/group-02/access_controller!46
2021-04-01 17:06:29 +00:00
603ba30d59
#44 | fix work.css form-check-input
2021-04-01 10:03:21 -07:00
Кравченко Артем
59882094bd
Update README.md
2021-04-01 17:01:38 +00:00
Кравченко Артем
4dd48a5e4b
Merge branch 'hotfix/role_view' into 'develop'
...
Hotfix/role view
See merge request 2020-2021/online/s101/group-02/access_controller!43
2021-03-29 21:58:39 +00:00
Timofey Mazurov
17328650c8
Fixed control page role changing
2021-03-30 00:45:32 +03:00
Timofey Mazurov
c7c019f70b
Merge branch 'develop' into hotfix/role_view
...
# Conflicts:
# main/views.py
2021-03-30 00:39:28 +03:00
Timofey Mazurov
99979858f0
Deleted main page logging example
2021-03-30 00:30:38 +03:00
Timofey Mazurov
3aa84cd04c
Fixed role display on profile and admin pages
2021-03-30 00:29:47 +03:00
Artyom Kravchenko
697f21be45
fixed messages
2021-03-29 18:32:15 +03:00
Кравченко Артем
7cef5c3a86
Merge branch 'feature/documentation' into 'develop'
...
Feature/documentation
See merge request 2020-2021/online/s101/group-02/access_controller!41
2021-03-27 17:31:26 +00:00
Степаненко Ольга
a4a797aa40
Make spelling
2021-03-27 16:32:44 +03:00
Степаненко Ольга
4a0dfd2890
Add spelling version
2021-03-27 14:12:44 +03:00
Степаненко Ольга
09a3e134ea
Make users docs for rermission pages
2021-03-27 11:50:22 +03:00
Степаненко Ольга
f45a01fd12
Make user docs for main, registration and ligin pages
2021-03-27 10:53:15 +03:00
Степаненко Ольга
0413a2edaf
Add apiauth and serializers docs
2021-03-23 20:55:30 +03:00
Степаненко Ольга
2ce272d206
Add models docs after pulling
2021-03-23 20:22:42 +03:00
Степаненко Ольга
b483998686
Add views docs after pulling
2021-03-23 15:27:52 +03:00
Степаненко Ольга
6c19ebdd3e
Add extra_func docs after pulling
2021-03-23 15:05:16 +03:00
Степаненко Ольга
ae9f41fd23
Merge branch 'develop' into feature/documentation
...
# Conflicts:
# main/extra_func.py
# main/models.py
# main/views.py
2021-03-23 14:10:27 +03:00
Степаненко Ольга
252f3e8144
Change views docs
2021-03-23 13:53:00 +03:00
Кравченко Артем
e9e089d713
Merge branch 'feature/notifications' into 'develop'
...
Added notifications about role changes
See merge request 2020-2021/online/s101/group-02/access_controller!39
2021-03-22 08:48:19 +00:00
Yuriy Kulakov
a8ca0b0eae
Added notificcations about role changes
2021-03-21 19:47:42 +03:00
Кравченко Артем
74823e6c26
Merge branch 'feature/licenses_remaining' into 'develop'
...
#43 | Отображение Количества Свободных Мест на Роль Инженера
See merge request 2020-2021/online/s101/group-02/access_controller!38
2021-03-20 12:24:33 +00:00
0c2e2d81bc
#43 | Add max agents setting. Spots left count on /work/<id> and /control/
2021-03-19 23:45:08 -07:00
Artyom Kravchenko
7e2e6a7ab7
Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop
2021-03-18 20:48:36 +03:00
Artyom Kravchenko
da46d019cb
add TODO
2021-03-18 20:48:06 +03:00
Кравченко Артем
b4d91ecd06
Update README.md
2021-03-18 17:43:55 +00:00
Кравченко Артем
1bb8e44d03
Merge branch 'hotfix/ticket_unassignment' into 'develop'
...
Hotfix/ticket unassignment
See merge request 2020-2021/online/s101/group-02/access_controller!35
2021-03-18 17:21:04 +00:00
Sokurov Idar
358351d6da
optimize imports
2021-03-18 20:19:08 +03:00
Sokurov Idar
e563475ecd
Merge branch 'develop' into hotfix/ticket_unassignment
...
# Conflicts:
# access_controller/settings.py
# main/extra_func.py
# main/views.py
2021-03-18 20:18:13 +03:00
Sokurov Idar
b5c3a12193
minor fix
2021-03-18 20:07:21 +03:00
2bb2c9556b
fix ./manage.py migrate errors
2021-03-18 09:32:46 -07:00
Кравченко Артем
870ce45a63
Merge branch 'feature/periodic' into 'develop'
...
Feature/periodic into develop
See merge request 2020-2021/online/s101/group-02/access_controller!33
2021-03-18 14:24:19 +00:00
Степаненко Ольга
0a7b4fb1a7
Temporary vertion with non-working enchant
2021-03-18 17:03:30 +03:00
Степаненко Ольга
10e341fcbb
Merge branch 'develop' into feature/documentation
...
# Conflicts:
# main/templates/registration/login.html
2021-03-18 09:59:18 +03:00
Sokurov Idar
5ec2407211
Add ticket unassignment
2021-03-17 09:35:15 +03:00
Кравченко Артем
bee14a628c
Merge branch 'feature/fixture/backend' into 'develop'
...
Added fixture with base users
See merge request 2020-2021/online/s101/group-02/access_controller!34
2021-03-15 18:27:56 +00:00
Yuriy Kulakov
e75e93287e
Added fixture with base users
2021-03-14 17:54:55 +03:00
Sokurov Idar
0cc788c039
minor fix
2021-03-14 17:26:41 +03:00
Sokurov Idar
a430ee871d
Add ticket unassignment(exclude solved tickets)
2021-03-14 17:13:41 +03:00
Степаненко Ольга
4f240e19f6
Add spelling settings and install tox but spelling is not still working
2021-03-14 16:30:14 +03:00
Степаненко Ольга
79b7418b61
Add enchant without correct working
2021-03-14 15:41:58 +03:00
Sokurov Idar
1cd8874e03
Merge branch 'develop' into hotfix/ticket_unassignment
...
# Conflicts:
# main/models.py
2021-03-14 13:12:59 +03:00
Степаненко Ольга
c9ae302103
Add documentation to new forms, and first part of extra_func
2021-03-14 12:42:18 +03:00
Степаненко Ольга
be6005c4be
Correct view documentation using typehints
2021-03-13 16:41:28 +03:00
Степаненко Ольга
d50a88e8bc
Add params to extra_func
2021-03-12 18:38:03 +03:00
