CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
121 Commits 2 Branches 0 Tags
Commit Graph

49 Commits

Author SHA1 Message Date
Yuriy Kulakov
8488ea88c2 Added Django REST but have some bugs 2021-03-07 21:30:02 +03:00
Andrew Smirnov
5909750fcc
Remove todolist commant 2021-03-04 20:56:38 +03:00
Andrew Smirnov
a393c31a13
Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	main/views.py
 2021-03-04 20:56:02 +03:00
Andrew Smirnov
1d7ff524b0
Documentation fix 
Add enchant, remove intersphinx useless links, remove napoleon, fix todos
 2021-03-04 20:54:45 +03:00
Кулаков Юрий
fa3716c2df Merge branch 'develop' into feature/adm_ruleset/backend 2021-03-04 20:46:25 +03:00
Кулаков Юрий
9ddf1db2a3 Fixed bug with permissions 2021-03-04 20:45:55 +03:00
Andrew Smirnov
656081295e
Profile view page refactoring 2021-03-04 20:01:10 +03:00
Yuriy Kulakov
525bb25697 Merge branch 'develop' into feature/adm_ruleset/backend 2021-03-04 19:06:45 +03:00
Yuriy Kulakov
1fac1b4835 Merge branch 'develop' into feature/adm_ruleset/backend 
# Conflicts:
#	main/views.py
 2021-03-04 18:32:08 +03:00
Yuriy Kulakov
d46b90010d Added permissions system to control page 2021-03-04 18:22:49 +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
Andrey Kovalev
09a423060c Merge 'develop' into 'feature/work/backend' 2021-03-02 20:19:42 +03:00
Andrey Kovalev
f7522c9c69 Fix page html code 2021-02-28 17:27:07 +03:00
Кулаков Юрий
8df2b66b7a Added engineers and light_agents count from organization to control page 2021-02-25 21:57:04 +03:00
Andrew Smirnov
3337596749
Remove useless auth check 2021-02-25 20:05:04 +03:00
Yuriy Kulakov
8ac6b10af2 merged with develop 2021-02-25 19:31:26 +03:00
Andrey Kovalev
b1d42ece61 Fixed name parametrs in env 2021-02-25 19:01:09 +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
61ea10f1d2 test role change 2021-02-25 18:24:14 +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
Andrew Smirnov
e955dfab99
Fix registrationForm (add is_valid call) 2021-02-18 21:04:45 +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
c2c1477983 small refactoring 2021-02-18 19:50:33 +03:00
Sokurov Idar
b777d47041 Recreate registration v1 2021-02-18 19:22:10 +03:00
Andrey Kovalev
8ba662c0ca Fix role end-user -> admin 2021-02-17 21:38:41 +03:00
Andrey Kovalev
bf69c870cd Add rights management backend 2021-02-17 20:43:57 +03:00
Sokurov Idar
21ab4bf6cc Complete registration, small update profile.html 2021-02-16 22:32:29 +03:00
Andrew Smirnov
8c9b5a9cfa
Fix urls, update menu, codestyle improvements, add views in documentation 2021-02-11 20:58:07 +03:00
Andrew Smirnov
ac99a23a3b
Small code style improvements 2021-02-11 20:15:46 +03:00
Artyom Kravchenko
7a5c7faf91 resolve merge conflicts 2021-02-11 01:55:28 +03:00
Artyom Kravchenko
c5bdb7cb6f add login_required to profile view 2021-02-11 00:02:22 +03:00
Artyom Kravchenko
9cdcdb7a0c fixed registrarion/requirements 2021-02-10 23:29:28 +03:00
Sokurov Idar
e5964f6eaf Merge branch 'feature/registration' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into feature/registration 
# Conflicts:
#	main/views.py
 2021-02-10 19:16:16 +03:00
Sokurov Idar
938b9894fe Add Zendesk password check 
Add Bootstrap to forms
Add custom form
 2021-02-10 19:05:46 +03:00
Сокуров Идар
0bc34f8100 Update main/views.py, README.md files 2021-02-08 17:17:03 +00:00
Sokurov Idar
729c0bec7e Email on zendesk exist check 2021-02-08 20:12:24 +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
Dmitriy Andreev
972ee3e4d4 Added base html 2021-02-07 15:02:08 +03:00
Sokurov Idar
3d4a49a350 fix typo 2021-02-06 14:45:39 +03:00
Sokurov Idar
981e793e3e Add profile page and temporary base.html 2021-02-06 14:33:55 +03:00
Andrew Smirnov
6056a1e85b
Initial commit. Add django. 2021-02-04 20:01:35 +03:00