217 Commits

Author SHA1 Message Date
Sokurov Idar
8a0a1639fc Add new page if email has not sent 2021-04-13 20:58:36 +03:00
Сокуров Идар
68b1f64d36 Change sequence of actions 2021-04-13 14:15:12 +00:00
Sokurov Idar
8c0a589173 Add SMTP error check 2021-04-11 01:12:07 +03:00
Artyom Kravchenko
19fc23808c test nginx 2021-04-08 15:39:47 +03:00
Artyom Kravchenko
2ea31e1594 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-04-06 18:04:22 +03:00
Artyom Kravchenko
870cbca99c tmp commit 2021-04-06 18:04:13 +03:00
Кравченко Артем
5001d1c71d Merge branch 'feature/statistic/main' into 'develop'
Feature/statistic/main

See merge request 2020-2021/online/s101/group-02/access_controller!42
2021-04-06 14:35:38 +00:00
Кравченко Артем
6f03526782 Merge branch 'feature/periodic_refactor' into 'develop'
Removed django context, now uses only React

See merge request 2020-2021/online/s101/group-02/access_controller!48
2021-04-06 14:35:24 +00:00
Artyom Kravchenko
b3db81203f add daphne to requirements 2021-04-05 14:53:47 +03:00
Yuriy Kulakov
30407e09dc Removed django context, now uses only React 2021-04-04 20:03:35 +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
Sokurov Idar
f47840f292 small refactoring 2021-03-29 22:37:18 +03:00
Sokurov Idar
9e49a12524 Merge branch 'develop' into feature/statistic/main
# Conflicts:
#	main/models.py
#	main/views.py
2021-03-29 21:45:07 +03:00
Sokurov Idar
6fd81c3ccc marge statistic/backend and statistic/frontend 2021-03-29 21:40:13 +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
Sokurov Idar
b50a6668a6 Merge branch 'develop' into feature/statistic/html 2021-03-18 22:59:40 +03: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