112 Commits

Author SHA1 Message Date
Andrew Smirnov
839a333691
Merge branch 'develop' into feature/pylint
# Conflicts:
#	main/tests.py
#	main/views.py
#	main/zendesk_admin.py
#	requirements/common.txt
2021-05-13 20:45:06 +03:00
Сокуров Идар
76cd782ff4 Add get tickets tests 2021-05-13 04:49:02 +00:00
Степаненко Ольга
f803d81caf Pylint for extra_func.py 2021-05-10 20:49:55 +03:00
Степаненко Ольга
015016bd6e Merge with "develop", begin to check again 2021-05-10 20:43:17 +03:00
Степаненко Ольга
492260dc79 Merge branch 'develop' into feature/pylint
# Conflicts:
#	main/extra_func.py
#	main/tests.py
#	main/views.py
2021-05-10 20:22:39 +03:00
be1bfdd259
Revert "Move main helper files to main/lib."
This reverts commit 6bc1c6d1089ceadd24bcd10a809816a51abb5068.
2021-05-06 08:47:15 -07:00
6bc1c6d108
Move main helper files to main/lib. 2021-05-06 08:45:15 -07:00
cc4c4ffdc2
Merge branch 'develop' into feature/profiling 2021-05-06 08:33:03 -07:00
Сокуров Идар
0086d4909e Feature/tests/make_eng from work and control pages 2021-05-06 15:22:57 +00:00
Степаненко Ольга
5ea0aa9454 Fix 2021-05-06 18:17:20 +03:00
Степаненко Ольга
0dc840bba7 Merge remote-tracking branch 'origin/feature/pylint' into feature/pylint
# Conflicts:
#	README.md
#	access_controller/settings.py
#	main/extra_func.py
#	main/models.py
#	main/views.py
2021-05-06 18:10:57 +03:00
Степаненко Ольга
8646e668c1 Pylint for extra_func 2021-05-06 17:36:38 +03:00
Степаненко Ольга
12db461b5d Pylint for views 2021-05-06 16:42:15 +03:00
Степаненко Ольга
276c979b73 Change make_engineer 2021-05-06 12:51:40 +03:00
Степаненко Ольга
f24c94914f Change User to get_user_model - fix problems 2021-05-06 12:43:44 +03:00
Степаненко Ольга
9c9b4dd08b Change User to get_user_model 2021-05-06 12:26:45 +03:00
Степаненко Ольга
4b25ec4b33 Merge branch 'develop' into feature/pylint
# Conflicts:
#	main/extra_func.py
#	main/tests.py
2021-05-06 12:00:39 +03:00
Timofey Mazurov
f77256937e Added logging for work pages 2021-05-06 02:44:53 +03:00
Sokurov Idar
cf2e9ccf21 Add get group tickets requests 2021-05-06 00:41:20 +03:00
Andrew Smirnov
eb1ef72adb
Merge branch 'develop' into feature/pylint
# Conflicts:
#	main/extra_func.py
2021-04-29 20:38:20 +03:00
Andrew Smirnov
eea8e0aab8
Pylint improvements 2021-04-29 20:37:38 +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
Степаненко Ольга
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
Степаненко Ольга
8e0610840d Pylint 7.5 2021-04-27 19:41:47 +03:00
Степаненко Ольга
015d5f65a7 Translate README.md to README.rst 2021-04-25 17:51:50 +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
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
750371e595
move ZendeskAdmin to separate file 2021-04-20 13:29:46 -07: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
b4c0ab0d67 Merge branch 'develop' into feature/dockerbuild 2021-04-19 14:46:12 +03:00
Andrew Smirnov
18cc98f11a
Fix type hints 2021-04-15 19:55:34 +03:00
cc08c0171b
Merge branch 'develop' into feature/docker 2021-04-15 09:40:00 -07:00
Sokurov Idar
2c14f65d4f Merge branch 'develop' into feature/registration_bug
# Conflicts:
#	main/views.py
2021-04-13 22:11:31 +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
Yuriy Kulakov
fea4575562 Control page displays all users from zendesk and db 2021-04-11 17:35:42 +03:00
Sokurov Idar
8c0a589173 Add SMTP error check 2021-04-11 01:12:07 +03:00
508324c62c
Move email, secrets, run params to env. Update README.md 2021-04-09 01:34:19 -07:00
Timofey Mazurov
9b1f04387c Merge branch 'develop' into feature/logging/func
# Conflicts:
#	main/extra_func.py
#	main/models.py
#	main/views.py
2021-04-08 21:04:27 +03:00
Кравченко Артем
5001d1c71d Merge branch 'feature/statistic/main' into 'develop'
Feature/statistic/main

See merge request 2020-2021/online/s101/group-02/access_controller!42
2021-04-06 14:35:38 +00:00
Timofey Mazurov
17328650c8 Fixed control page role changing 2021-03-30 00:45:32 +03:00
Sokurov Idar
f47840f292 small refactoring 2021-03-29 22:37:18 +03:00
Степаненко Ольга
a4a797aa40 Make spelling 2021-03-27 16:32:44 +03:00
Степаненко Ольга
6c19ebdd3e Add extra_func docs after pulling 2021-03-23 15:05:16 +03:00
Степаненко Ольга
ae9f41fd23 Merge branch 'develop' into feature/documentation
# Conflicts:
#	main/extra_func.py
#	main/models.py
#	main/views.py
2021-03-23 14:10:27 +03:00