542 Commits

Author SHA1 Message Date
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
7e3b2a918e Merge branch 'develop' into feature/test_table_design 2021-04-25 20:34:44 +03:00
Yuriy Kulakov
a0c3a41360 Changed styles of inactive users in table 2021-04-25 20:22:19 +03:00
Yuriy Kulakov
746a2c2543 small fixes 2021-04-25 20:17:02 +03:00
Yuriy Kulakov
5bd37d2203 Added first templates of react tests 2021-04-25 19:58:56 +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
Sokurov Idar
3019246935 Add custom ticket requests 2021-04-23 00:31:43 +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
Кравченко Артем
c7048f8ca6 Merge branch 'feature/docker' into 'develop'
Feature/docker

See merge request 2020-2021/online/s101/group-02/access_controller!50
2021-04-19 17:20:13 +00:00
Artyom Kravchenko
b929502ace modified data.json 2021-04-19 20:05:56 +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
Кравченко Артем
223241703f Merge branch 'feature/mail_field_fix' into 'develop'
Mail field fix

See merge request 2020-2021/online/s101/group-02/access_controller!58
2021-04-19 10:22:13 +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
Dmitriy Andreev
8417616bac Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-04-15 19:57:16 +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
cc08c0171b
Merge branch 'develop' into feature/docker 2021-04-15 09:40:00 -07:00
Dmitriy Andreev
82bddb8d82 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-04-15 19:03:44 +03:00
f21eb2dcd4
minor fixes 2021-04-15 09:02:22 -07:00
Artyom Kravchenko
afec8e59e4 merge take tickets 2021-04-15 18:47:58 +03:00