361 Commits

Author SHA1 Message Date
Andrew Smirnov
edd103b782
Merge branch 'develop' into feature/profile_page_lookfix 2021-04-29 20:13:47 +03:00
Andrew Smirnov
db9676358a
Merge branch 'develop' into feature/profiling
# Conflicts:
#	main/extra_func.py
2021-04-29 20:12:00 +03:00
Andrew Smirnov
bac3cf4dfd
Merge develop into feature/registration_failed/html 2021-04-29 20:03:04 +03:00
Andrew Smirnov
73e9c9fd34
Fix make_light_agent method while tickets.count is 0. 2021-04-29 19:52:03 +03:00
Yuriy Kulakov
82fde03db9 Merge branch 'develop' into feature/react_test
# Conflicts:
#	static/main/js/control_page/control.js
2021-04-29 16:52:31 +03:00
Yuriy Kulakov
760d28a768 Update package.json 2021-04-29 16:33:41 +03:00
Dmitriy Andreev
6b9cd05227 Profile page lookfix 2021-04-28 22:21:37 +03:00
Степаненко Ольга
3155374185 Spell new docs 2021-04-28 21:17:41 +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
Степаненко Ольга
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
Yuriy Kulakov
3b9ae4f2fa Added django_node_assets 2021-04-27 20:24:58 +03:00
Степаненко Ольга
8e0610840d Pylint 7.5 2021-04-27 19:41:47 +03: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
5c3801c317 Add password change page 2021-04-26 21:47:45 +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
Sokurov Idar
3019246935 Add custom ticket requests 2021-04-23 00:31:43 +03: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
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
Artyom Kravchenko
f4d4cffa9f tmp commit 2021-04-19 17:52:10 +03:00
Artyom Kravchenko
b4c0ab0d67 Merge branch 'develop' into feature/dockerbuild 2021-04-19 14:46:12 +03:00
Artyom Kravchenko
ecf32a0ae7 merge st_button 2021-04-19 13:39:43 +03:00
Кравченко Артем
8e5fdc6ad6 Merge branch 'feature/periodic_upgrade' into 'develop'
Now the first column of table at control page is checkbox

See merge request 2020-2021/online/s101/group-02/access_controller!60
2021-04-19 10:22:54 +00:00
Yuriy Kulakov
af63ee29f3 Now the first column of table at control page is checkbox 2021-04-18 19:15:23 +03:00
Vadim Melnikov
4b8cd9c67f Fixed mail field in statistics page 2021-04-16 16:18:34 +03:00
Vadim Melnikov
2ec95dcb00 Added statistics button + fixed stats page buttons highlight 2021-04-16 16:14:37 +03:00
Andrew Smirnov
06256c202d
Fix statistic html 2021-04-15 20:28:43 +03:00
Andrew Smirnov
0fbf666edd
Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-04-15 19:55:53 +03:00
Andrew Smirnov
18cc98f11a
Fix type hints 2021-04-15 19:55:34 +03:00
13c1bbb27d
Merge branch 'develop' into feature/docker 2021-04-15 09:43:51 -07:00