13 Commits

Author SHA1 Message Date
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