42 Commits

Author SHA1 Message Date
Степаненко Ольга
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
Сокуров Идар
66339c4f6b Add registration tests 2021-05-05 23:44:24 +00:00
Степаненко Ольга
d8b15d087b Add pylint settings - .pylintrc file 2021-04-28 11:53:29 +03:00
Artyom Kravchenko
f4d4cffa9f tmp commit 2021-04-19 17:52:10 +03:00
cc08c0171b
Merge branch 'develop' into feature/docker 2021-04-15 09:40:00 -07:00
508324c62c
Move email, secrets, run params to env. Update README.md 2021-04-09 01:34:19 -07:00
Artyom Kravchenko
0e6f016d1e Merge branch 'develop' into feature/docker 2021-04-08 15:45:43 +03:00
Artyom Kravchenko
19fc23808c test nginx 2021-04-08 15:39:47 +03:00
Artyom Kravchenko
ff8834f22d fixed migrations bug 2021-03-31 15:02:37 +03:00
Artyom Kravchenko
7de09037c1 add env params 2021-03-31 10:54:16 +03:00
Artyom Kravchenko
d58c1c9fd8 db path fixed 2021-03-30 23:30:31 +03:00
Artyom Kravchenko
4f106c4e17 merge dev 2021-03-30 17:32:35 +03:00
Artyom Kravchenko
e96ee7ac5b modified setings for starting db with docker volume 2021-03-22 17:08:17 +03:00
0c2e2d81bc
#43 | Add max agents setting. Spots left count on /work/<id> and /control/ 2021-03-19 23:45:08 -07:00
Sokurov Idar
e563475ecd Merge branch 'develop' into hotfix/ticket_unassignment
# Conflicts:
#	access_controller/settings.py
#	main/extra_func.py
#	main/views.py
2021-03-18 20:18:13 +03:00
Sokurov Idar
5ec2407211 Add ticket unassignment 2021-03-17 09:35:15 +03:00
Sokurov Idar
a430ee871d Add ticket unassignment(exclude solved tickets) 2021-03-14 17:13:41 +03:00
Yuriy Kulakov
d300cc2f06 Merge branch 'develop' into feature/periodic
# Conflicts:
#	access_controller/settings.py
#	access_controller/urls.py
#	main/extra_func.py
#	main/views.py
2021-03-12 15:37:50 +03:00
Sokurov Idar
60e1da2825 12-hour working day 2021-03-11 19:17:11 +03:00
Yuriy Kulakov
8488ea88c2 Added Django REST but have some bugs 2021-03-07 21:30:02 +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
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
Artyom Kravchenko
b0932c94b6 merge registration branch 2021-02-25 14:17:36 +03:00
Yuriy Kulakov
baf02cca44 Added user list function 2021-02-23 19:46:43 +03:00
Yuriy Kulakov
034c3eed70 Added admin control page 2021-02-21 21:35:36 +03:00
Sokurov Idar
8b512afadb fix bug, update registration 2021-02-19 17:55:27 +03:00
Sokurov Idar
0953a0627e Temporary 2021-02-18 20:58:10 +03:00
Andrew Smirnov
ca1fab09c9
Add logging framework usage example 2021-02-18 20:45:56 +03:00
Sokurov Idar
b777d47041 Recreate registration v1 2021-02-18 19:22:10 +03:00
Sokurov Idar
d91f5b8ba8 Add media to staticfiles, update profile.html 2021-02-11 21:26:02 +03:00
Andrew Smirnov
8c9b5a9cfa
Fix urls, update menu, codestyle improvements, add views in documentation 2021-02-11 20:58:07 +03:00
Кравченко Артем
ef36e8de40 Merge branch 'feature/base/html' into 'develop'
A few changes design of menu

See merge request 2020-2021/online/s101/group-02/access_controller!5
2021-02-11 17:28:55 +00:00
Artyom Kravchenko
7a5c7faf91 resolve merge conflicts 2021-02-11 01:55:28 +03:00
Dmitriy Andreev
298baa3198 Added site logo 2021-02-10 21:18:38 +03:00
Sokurov Idar
16fd0e3983 Merge remote-tracking branch 'origin/feature/profile_page' into feature/registration
# Conflicts:
#	access_controller/urls.py
#	main/views.py
2021-02-08 19:12:51 +03:00
Sokurov Idar
b8e3d11c6f Add first version registration 2021-02-08 19:10:44 +03:00
Кулаков Юрий
f6193a837a Added authorization page 2021-02-07 20:17:27 +03:00
Sokurov Idar
981e793e3e Add profile page and temporary base.html 2021-02-06 14:33:55 +03:00
Andrew Smirnov
234669242f
Add profile model, update requirements, readme and gitignore 2021-02-04 20:37:58 +03:00
Andrew Smirnov
6056a1e85b
Initial commit. Add django. 2021-02-04 20:01:35 +03:00