348 Commits

Author SHA1 Message Date
Степаненко Ольга
276c979b73 Change make_engineer 2021-05-06 12:51:40 +03:00
Степаненко Ольга
f24c94914f Change User to get_user_model - fix problems 2021-05-06 12:43:44 +03:00
Степаненко Ольга
9c9b4dd08b Change User to get_user_model 2021-05-06 12:26:45 +03:00
Степаненко Ольга
4b25ec4b33 Merge branch 'develop' into feature/pylint
# Conflicts:
#	main/extra_func.py
#	main/tests.py
2021-05-06 12:00:39 +03:00
58717022c5 Merge branch 'hotfix/logs' into 'develop'
Added logging for work pages

See merge request 2020-2021/online/s101/group-02/access_controller!70
2021-05-05 23:54:13 +00:00
Timofey Mazurov
f77256937e Added logging for work pages 2021-05-06 02:44:53 +03:00
824077fbd9 Merge branch 'feature/register_tests' into 'develop'
#72 | Add registration tests

See merge request 2020-2021/online/s101/group-02/access_controller!64
2021-05-05 23:44:24 +00:00
Сокуров Идар
66339c4f6b Add registration tests 2021-05-05 23:44:24 +00:00
Andrew Smirnov
3c40cefdb6
Merge branch 'develop' into feature/work/layout 2021-04-29 20:06:48 +03:00
Andrew Smirnov
cf4a11a2c0
Merge branch 'develop' into feature/registration_success/layout 2021-04-29 20:04:05 +03:00
Смирнов Андрей Александрович
1889b6cdb7 Merge branch 'hotfix/make_light_agent_with_zero_tickets' into 'develop'
Fix make_light_agent method while tickets.count is 0.

See merge request 2020-2021/online/s101/group-02/access_controller!67
2021-04-29 16:53:06 +00:00
Andrew Smirnov
73e9c9fd34
Fix make_light_agent method while tickets.count is 0. 2021-04-29 19:52:03 +03:00
Степаненко Ольга
cc83f292de Fix autopep8 problem 2021-04-28 19:36:21 +03:00
Степаненко Ольга
2e3e567d2d Use pylint for some files 2021-04-28 18:57:36 +03:00
Степаненко Ольга
4666570177 Use pylint for zendesk_admin.py 2021-04-28 16:42:19 +03:00
Степаненко Ольга
e5460d90fc Use pylint for models.py 2021-04-28 16:18:55 +03:00
Степаненко Ольга
a7dd7d84e0 Use pylint for extra_func.py 2021-04-28 15:39:25 +03:00
Степаненко Ольга
d828afc504 Merge branch 'develop' into feature/pylint 2021-04-28 14:27:27 +03:00
Кравченко Артем
96e5865d3b Merge branch 'feature/change_pswd_btn' into 'develop'
Исправлены уведомления, добавлена страница смены пароля

See merge request 2020-2021/online/s101/group-02/access_controller!65
2021-04-28 11:24:18 +00:00
Кравченко Артем
97ec66da2c Merge branch 'feature/table_design' into 'develop'
Changed styles of inactive users in table

See merge request 2020-2021/online/s101/group-02/access_controller!63
2021-04-28 11:23:47 +00:00
Степаненко Ольга
3b54a520cb Use pylint for views 2021-04-28 14:15:40 +03:00
Степаненко Ольга
d8b15d087b Add pylint settings - .pylintrc file 2021-04-28 11:53:29 +03:00
Степаненко Ольга
8e0610840d Pylint 7.5 2021-04-27 19:41:47 +03:00
006858e63f Update README.md 2021-04-27 16:05:21 +00:00
Степаненко Ольга
3f6cf23f4e Add autopep8. First draft 2021-04-27 17:28:01 +03:00
Степаненко Ольга
bd8ba97a46 Add pylint, add init-file in access_controller folder to run pylint 2021-04-27 12:10:29 +03:00
Степаненко Ольга
68833ccdd5 Fix models problem 2021-04-27 09:56:38 +03:00
Степаненко Ольга
8dd8e7640a Update docs for files (except views) 2021-04-27 09:40:05 +03:00
Sokurov Idar
43668f9ecf tmp commit 2021-04-26 22:02:20 +03:00
Sokurov Idar
b2e7c84913 change notifications duration 2021-04-26 22:00:38 +03:00
Sokurov Idar
18c76f1340 Fix .gitignore, add required files 2021-04-26 21:54:15 +03:00
Sokurov Idar
5c3801c317 Add password change page 2021-04-26 21:47:45 +03:00
Yuriy Kulakov
a0c3a41360 Changed styles of inactive users in table 2021-04-25 20:22:19 +03:00
Степаненко Ольга
aa59eb31ec Add m2r to requirements 2021-04-25 17:59:34 +03:00
Степаненко Ольга
015d5f65a7 Translate README.md to README.rst 2021-04-25 17:51:50 +03:00
Степаненко Ольга
b5f5fdf9dc Merge branch 'develop' into feature/documentation
# Conflicts:
#	README.md
#	main/extra_func.py
#	main/forms.py
#	main/views.py
2021-04-25 12:01:47 +03:00
Кравченко Артем
1bb951dcda Merge branch 'feature/refactor' into 'develop'
Zendesk API Query Optimizations and Refactor, Small Fixes

Closes #58

See merge request 2020-2021/online/s101/group-02/access_controller!62
2021-04-22 07:05:23 +00:00
974de20d5f
Merge branch 'develop' into feature/refactor 2021-04-20 15:45:58 -07:00
f65eb54652
Small views.py refactor 2021-04-20 15:39:55 -07:00
7f837d9944
Remove unnecessary ZendeskAdmin methods 2021-04-20 15:34:10 -07:00
8d14f2e8b4
Fix some type hints, small ZendeskAdmin refactor 2021-04-20 15:19:02 -07:00
95d0db24b6
Find buffer group id and solved tickets user id in ZendeskAdmin constructor 2021-04-20 15:02:17 -07:00
a5d0c222bd
Multiple attempts to change role to compensate Zendesk API delay 2021-04-20 14:49:17 -07:00
Кравченко Артем
38f1f14e7b Merge branch 'feature/notifications' into 'develop'
Feature/notifications

See merge request 2020-2021/online/s101/group-02/access_controller!61
2021-04-20 21:00:05 +00:00
045d2cfb2b
bulk request for tickets to buffer group 2021-04-20 13:30:15 -07:00
Сокуров Идар
30e4d93c81 Update views.py 2021-04-20 20:30:11 +00:00
750371e595
move ZendeskAdmin to separate file 2021-04-20 13:29:46 -07:00
Sokurov Idar
05a4bc70f2 minor fix 2021-04-20 23:01:31 +03:00
Sokurov Idar
cff6443eca Add notifications on work page, rebase already exists with notifications.js 2021-04-20 22:55:22 +03:00
Artyom Kravchenko
83939f6681 fixed permissions for statistic page 2021-04-20 10:53:45 +03:00