Commit Graph
255 Commits
Author SHA1 Message Date
Yuriy Kulakov 716af21f48 Merge branch 'feature/control_test' into feature/react_test
# Conflicts:
#	.gitignore
#	main/tests.py
2021-05-13 20:44:15 +03:00
Andrew Smirnov 8b70827f07 Merge branch 'develop' into feature/react_test
# Conflicts:
#	main/templates/pages/adm_ruleset.html
#	static/main/js/control.js
2021-05-13 20:02:27 +03:00
Сокуров ИдарandCaZzzer 74f8b1ce1f Add profile tests 2021-05-13 04:57:51 +00:00
Сокуров ИдарandCaZzzer 76cd782ff4 Add get tickets tests 2021-05-13 04:49:02 +00:00
Сокуров ИдарandCaZzzer e19cbdb85a Add reset password tests 2021-05-11 05:56:39 +00:00
Андреев ДмитрийandCaZzzer 63949dd54e Fix/header 2021-05-10 15:05:34 +00:00
Yuriy Kulakov e32f12019e Added control page tests and fixed bugs 2021-05-07 22:29:50 +03:00
CaZzzer e886004069 Remove unnecessary files. 2021-05-06 09:07:21 -07:00
CaZzzer be1bfdd259 Revert "Move main helper files to main/lib."
This reverts commit 6bc1c6d108.
2021-05-06 08:47:15 -07:00
CaZzzer d426e9a2c4 fix 2021-05-06 08:46:41 -07:00
CaZzzer 6bc1c6d108 Move main helper files to main/lib. 2021-05-06 08:45:15 -07:00
CaZzzer cc4c4ffdc2 Merge branch 'develop' into feature/profiling 2021-05-06 08:33:03 -07:00
Сокуров ИдарandCaZzzer 0086d4909e Feature/tests/make_eng from work and control pages 2021-05-06 15:22:57 +00:00
CaZzzer 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
Сокуров ИдарandCaZzzer 66339c4f6b Add registration tests 2021-05-05 23:44:24 +00:00
Sokurov Idar cf2e9ccf21 Add get group tickets requests 2021-05-06 00:41:20 +03:00
Yuriy Kulakov 79fb2412d6 Added webpack for js 2021-05-04 18:19:30 +03:00
Yuriy Kulakov 6a4756f3f9 Added some tests to the control page 2021-05-03 13:04:19 +03:00
Yuriy Kulakov f4e5b9192e Changed scripts' sources at control ppage 2021-04-30 20:55:42 +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 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
Yuriy Kulakov 3b9ae4f2fa Added django_node_assets 2021-04-27 20:24:58 +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
Sokurov Idar 3019246935 Add custom ticket requests 2021-04-23 00:31:43 +03:00
CaZzzer 974de20d5f Merge branch 'develop' into feature/refactor 2021-04-20 15:45:58 -07:00
CaZzzer f65eb54652 Small views.py refactor 2021-04-20 15:39:55 -07:00
CaZzzer 7f837d9944 Remove unnecessary ZendeskAdmin methods 2021-04-20 15:34:10 -07:00
CaZzzer 8d14f2e8b4 Fix some type hints, small ZendeskAdmin refactor 2021-04-20 15:19:02 -07:00
CaZzzer 95d0db24b6 Find buffer group id and solved tickets user id in ZendeskAdmin constructor 2021-04-20 15:02:17 -07:00
CaZzzer a5d0c222bd Multiple attempts to change role to compensate Zendesk API delay 2021-04-20 14:49:17 -07:00
CaZzzer 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
CaZzzer 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