521 Commits

Author SHA1 Message Date
Andrew Smirnov
010dff2f9d
Fix model docs and enchant spelling tokenizer 2021-04-29 21:08:11 +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
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
3c40cefdb6
Merge branch 'develop' into feature/work/layout 2021-04-29 20:06:48 +03:00
Andrew Smirnov
cf4a11a2c0
Merge branch 'develop' into feature/registration_success/layout 2021-04-29 20:04:05 +03:00
Andrew Smirnov
0204c923a1
Merge branch 'feature/registration_failed/layout' into feature/registration_failed/html 2021-04-29 20:03:19 +03:00
Andrew Smirnov
bac3cf4dfd
Merge develop into feature/registration_failed/html 2021-04-29 20:03:04 +03:00
Andrew Smirnov
a0c945ff68
Merge branch 'develop' into feature/registration_failed/layout 2021-04-29 19:57:41 +03:00
Смирнов Андрей Александрович
1889b6cdb7 Merge branch 'hotfix/make_light_agent_with_zero_tickets' into 'develop'
Fix make_light_agent method while tickets.count is 0.

See merge request 2020-2021/online/s101/group-02/access_controller!67
2021-04-29 16:53:06 +00: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
Dmitriy Andreev
6b9cd05227 Profile page lookfix 2021-04-28 22:21:37 +03:00
Степаненко Ольга
3155374185 Spell new docs 2021-04-28 21:17:41 +03:00
Степаненко Ольга
cc83f292de Fix autopep8 problem 2021-04-28 19:36:21 +03:00
Степаненко Ольга
2e3e567d2d Use pylint for some files 2021-04-28 18:57:36 +03:00
Степаненко Ольга
4666570177 Use pylint for zendesk_admin.py 2021-04-28 16:42:19 +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
Степаненко Ольга
d828afc504 Merge branch 'develop' into feature/pylint 2021-04-28 14:27:27 +03:00
Кравченко Артем
96e5865d3b Merge branch 'feature/change_pswd_btn' into 'develop'
Исправлены уведомления, добавлена страница смены пароля

See merge request 2020-2021/online/s101/group-02/access_controller!65
2021-04-28 11:24:18 +00:00
Кравченко Артем
97ec66da2c Merge branch 'feature/table_design' into 'develop'
Changed styles of inactive users in table

See merge request 2020-2021/online/s101/group-02/access_controller!63
2021-04-28 11:23:47 +00:00
Степаненко Ольга
3b54a520cb Use pylint for views 2021-04-28 14:15:40 +03:00
Степаненко Ольга
d8b15d087b Add pylint settings - .pylintrc file 2021-04-28 11:53:29 +03:00
Yuriy Kulakov
0b73f4163e Merge branch 'develop' into feature/react_test 2021-04-27 22:07:57 +03:00
Yuriy Kulakov
3b9ae4f2fa Added django_node_assets 2021-04-27 20:24:58 +03:00
Степаненко Ольга
8e0610840d Pylint 7.5 2021-04-27 19:41:47 +03:00
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