Commit Graph
265 Commits
Author SHA1 Message Date
Andrew Smirnov 5748e3f842 Merge branch 'develop' into feature/statistic/month_name_bug 2021-05-20 19:43:39 +03:00
Кравченко Артем 9f8fd5f584 Merge branch 'feature/registration_failed/html' into 'develop'
Feature/registration failed/html

See merge request 2020-2021/online/s101/group-02/access_controller!84
2021-05-20 15:21:45 +00:00
Кравченко Артем 1453810fb8 Merge branch 'fix/profile_page_look' into 'develop'
Fix/profile page look

See merge request 2020-2021/online/s101/group-02/access_controller!72
2021-05-20 15:21:12 +00:00
Kanris d9f2842bfe Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-05-20 18:13:42 +03:00
Kanris 832889ec8a fixed bug password and token a mutually exclusive 2021-05-20 18:13:08 +03:00
CaZzzer c95c0fe00b Delete unused main/apiauth.py 2021-05-19 21:46:30 -07:00
Мазуров ТимофейandCaZzzer e0ca38cd6d Issue #75 2021-05-19 22:57:37 +00:00
CaZzzer 0a9f57155c #71 | Тесты Получения Прав Легкого Агента 2021-05-19 22:16:58 +00:00
Andrew Smirnov 95b685a812 Merge branch 'develop' into feature/statistic/month_name_bug
# Conflicts:
#	main/extra_func.py
2021-05-13 20:56:04 +03:00
Andrew Smirnov 6d3e4a0ac8 Merge branch 'develop' into fix/profile_page_look 2021-05-13 19:58:26 +03:00
Andrew Smirnov c1329e6788 Merge branch 'develop' into feature/registration_failed/html 2021-05-13 19:57:44 +03:00
Andrew Smirnov 23eb2bf2ec Fix month display on statistics page 2021-05-13 19:55:21 +03:00
Kiselev Igor 5f88a4f297 Fixed statistic view date bug 2021-05-13 17:51:28 +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
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
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
Dmitriy Andreev 6b9cd05227 Profile page lookfix 2021-04-28 22:21:37 +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