30 Commits

Author SHA1 Message Date
Степаненко Ольга
1114c916e9 Update docs (views, extra_func, forms, models) 2021-05-20 16:19:42 +03:00
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
Степаненко Ольга
2e3e567d2d Use pylint for some files 2021-04-28 18:57:36 +03:00
Степаненко Ольга
8e0610840d Pylint 7.5 2021-04-27 19:41:47 +03:00
Степаненко Ольга
8dd8e7640a Update docs for files (except views) 2021-04-27 09:40:05 +03:00
Vadim Melnikov
4b8cd9c67f Fixed mail field in statistics page 2021-04-16 16:18:34 +03:00
Andrew Smirnov
18cc98f11a
Fix type hints 2021-04-15 19:55:34 +03:00
Sokurov Idar
f47840f292 small refactoring 2021-03-29 22:37:18 +03:00
Sokurov Idar
9e49a12524 Merge branch 'develop' into feature/statistic/main
# Conflicts:
#	main/models.py
#	main/views.py
2021-03-29 21:45:07 +03:00
Sokurov Idar
6fd81c3ccc marge statistic/backend and statistic/frontend 2021-03-29 21:40:13 +03:00
Степаненко Ольга
a4a797aa40 Make spelling 2021-03-27 16:32:44 +03:00
Степаненко Ольга
c9ae302103 Add documentation to new forms, and first part of extra_func 2021-03-14 12:42:18 +03:00
Степаненко Ольга
be6005c4be Correct view documentation using typehints 2021-03-13 16:41:28 +03:00
Artyom Kravchenko
bd500207a3 Fixed AdminPageUSer form 2021-03-12 13:58:27 +03:00
Sokurov Idar
b825bcdff3 Update class StatisticData 2021-03-11 17:30:55 +03:00
Sokurov Idar
b96deab2cb Update statistic backend 2021-03-08 21:07:09 +03:00
Sokurov Idar
49046022d7 small refactor: change variable`s names, add a bit documentation 2021-03-08 17:50:47 +03:00
Sokurov Idar
4a604f0941 Merge branch 'develop' into feature/statistic/backend
# Conflicts:
#	access_controller/urls.py
#	main/forms.py
#	main/views.py
2021-03-04 23:16:21 +03:00
Sokurov Idar
fd1e048ebe statistic backend first version 2021-03-04 01:25:56 +03:00
Степаненко Ольга
cd47331ae7 After mergin develop 2021-03-03 21:05:31 +03:00
Степаненко Ольга
2bfa6619b1 Merge branch 'develop' into feature/documentation
# Conflicts:
#	main/forms.py
#	requirements.txt
2021-03-03 21:02:40 +03:00
Степаненко Ольга
0cda9da311 Add views and forms documentation 2021-03-03 20:59:53 +03:00
Sokurov Idar
4299b1ed37 Merge branch 'develop' into feature/registration
# Conflicts:
#	access_controller/urls.py
#	main/extra_func.py
#	main/forms.py
#	main/views.py
2021-03-02 21:53:43 +03:00
Sokurov Idar
f50ce49d77 update login with email 2021-03-02 21:44:13 +03:00
Степаненко Ольга
525a5a61d2 Change extra_func documentation 2021-03-02 16:52:20 +03:00
Yuriy Kulakov
918306aa48 Merge branch 'develop' into feature/adm_ruleset/backend
# Conflicts:
#	access_controller/settings.py
#	access_controller/urls.py
#	main/forms.py
#	main/views.py
2021-02-25 18:41:08 +03:00
Yuriy Kulakov
034c3eed70 Added admin control page 2021-02-21 21:35:36 +03:00
Sokurov Idar
b777d47041 Recreate registration v1 2021-02-18 19:22:10 +03:00
Sokurov Idar
938b9894fe Add Zendesk password check
Add Bootstrap to forms
Add custom form
2021-02-10 19:05:46 +03:00