Commit Graph
525 Commits
Author SHA1 Message Date
Кравченко Артем 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
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
Кравченко Артем 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
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
Кравченко Артем 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
CaZzzer 13c1bbb27d Merge branch 'develop' into feature/docker 2021-04-15 09:43:51 -07:00
CaZzzer 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
CaZzzer 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
Степаненко Ольга bf2c1cc1be Add Union and Optional types 2021-04-15 17:22:45 +03:00
Степаненко Ольга d3471331b1 Add READme docs 2021-04-15 14:43:54 +03:00
Степаненко Ольга df97d170bf Add autodoc_typehints = 'none' 2021-04-15 11:49:08 +03:00
CaZzzer d9b24def1a Merge branch 'hotfix/gmail' into 'develop'
Hotfix/gmail. Issue #57

See merge request 2020-2021/online/s101/group-02/access_controller!56
2021-04-15 04:45:18 +00:00
Сокуров ИдарandCaZzzer 9543a2935c Hotfix/gmail. Issue #57 2021-04-15 04:45:18 +00:00
Artyom Kravchenko 423951b144 merge button colors 2021-04-14 10:35:47 +03:00
Artyom Kravchenko 22f1d1394a Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-04-14 09:23:29 +03:00
Кравченко Артем fa239e6010 Merge branch 'feature/registration_bug' into 'develop'
Feature/registration bug. Issue #59

See merge request 2020-2021/online/s101/group-02/access_controller!55
2021-04-14 06:21:11 +00:00
Кравченко Артем 1fc337ab18 Merge branch 'feature/log_bug' into 'develop'
Add directory for logs. Issue #60

See merge request 2020-2021/online/s101/group-02/access_controller!54
2021-04-14 06:20:27 +00:00
Sokurov Idar 2c14f65d4f Merge branch 'develop' into feature/registration_bug
# Conflicts:
#	main/views.py
2021-04-13 22:11:31 +03:00
Sokurov Idar 8a0a1639fc Add new page if email has not sent 2021-04-13 20:58:36 +03:00
Сокуров Идар 68b1f64d36 Change sequence of actions 2021-04-13 14:15:12 +00:00
Степаненко Ольга 5ac60de2ef Fix some spelling problems 2021-04-13 16:53:18 +03:00
Мазуров Тимофей 897cd1210b Add directory for logs. Issue #60 2021-04-13 13:51:06 +00:00
Artyom Kravchenko 919e49ec45 resolve conflicts 2021-04-13 15:14:20 +03:00
Artyom Kravchenko 8dd0d0eec4 refactor view for work page 2021-04-13 15:10:50 +03:00
Кравченко Артем 7b49f45703 Merge branch 'feature/periodic_upgrade' into 'develop'
Control page displays all users from zendesk and db

See merge request 2020-2021/online/s101/group-02/access_controller!52
2021-04-13 12:01:29 +00:00