CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
538 Commits 2 Branches 0 Tags
74661bd7a43dfc4ddd133d191d34a7958bd30537
Commit Graph
538 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Kovalev b1d42ece61 Fixed name parametrs in env 2021-02-25 19:01:09 +03:00
Vadim Melnikov d3313c7ecf Added kind of dirty registration failed html 2021-02-25 18:52:57 +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
Кравченко Артем a6c8910b63 Merge branch 'feature/password_reset' into 'develop' 
Кнопка восстановления пароля привязана к странице

See merge request 2020-2021/online/s101/group-02/access_controller!21
 2021-02-25 14:21:51 +00:00
Тонковид Роман c71949dac6 Кнопка восстановления пароля привязана к странице 2021-02-25 16:13:49 +03:00
Artyom Kravchenko b0932c94b6 merge registration branch 2021-02-25 14:17:36 +03:00
Кравченко Артем 3f0aed5c73 Merge branch 'feature/adm_ruleset/html' into 'develop' 
html шаблон страницы управления правами (админ)

See merge request 2020-2021/online/s101/group-02/access_controller!19
 2021-02-25 08:49:51 +00:00
Yuriy Kulakov baf02cca44 Added user list function 2021-02-23 19:46:43 +03:00
Сокуров Идар 25734d847f Add password reset 2021-02-23 09:01:32 +00: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
Ivan Pesnya d19cfd103d done! 2021-02-18 20:51:34 +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
Кравченко Артем 46dc0f6ab6 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!14
 2021-02-18 09:34:17 +00:00
Степаненко Ольга cc44bdf068 Add template of users documentation 2021-02-18 11:44:13 +03:00
Степаненко Ольга ae5ed94bc9 Change extra_func documentation 2021-02-18 10:49:17 +03:00
Степаненко Ольга f25e2cd6ad Add forms documentation 2021-02-18 09:23:11 +03:00
Степаненко Ольга 774cbbe802 Fix warnings 2021-02-18 09:19:00 +03:00
Степаненко Ольга 61fa8761eb Merge branch 'develop' into feature/documentation 
# Conflicts:
#	main/extra_func.py
 2021-02-18 07:35:35 +03:00
Кравченко Артем 7708c0dbda Merge branch 'feature/logging/model' into 'develop' 
Added a model for logging user role changes

See merge request 2020-2021/online/s101/group-02/access_controller!12
 2021-02-17 22:33:47 +00:00
Vadim Melnikov 9342499d87 Added registration success layout 2021-02-17 21:57:24 +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
Кулаков Юрий 7e8bcb96e7 Added a model for logging user role changes 2021-02-17 20:30:57 +03:00
Кравченко Артем 227038ea38 Merge branch 'feature/work/html' into 'develop' 
Feature/work/html

See merge request 2020-2021/online/s101/group-02/access_controller!11
 2021-02-17 12:58:49 +00:00
Ivan Pesnya 905a9167f5 Merge branch 'develop' into feature/work/html 2021-02-17 15:50:10 +03:00
= 7d240651f6 mvp ready 2021-02-17 15:47:45 +03:00
Кравченко Артем fc88c70991 Merge branch 'feature/work/layout' into 'develop' 
Feature/work/layout

See merge request 2020-2021/online/s101/group-02/access_controller!9
 2021-02-16 22:27:26 +00:00
Елин Данила 4e0a9ce77f added adm_layout.png layout for admin access controller page 2021-02-16 23:38:13 +03:00
Елин Данила d2035640d9 added work.png layout for access control page 2021-02-16 23:35:57 +03:00
Кравченко Артем 54465848cf Merge branch 'feature/func_implement' into 'develop' 
Feature/func implement

See merge request 2020-2021/online/s101/group-02/access_controller!8
 2021-02-16 19:57:13 +00:00
Sokurov Idar 023eb69c0a add models migration 2021-02-16 22:33:54 +03:00
Sokurov Idar 21ab4bf6cc Complete registration, small update profile.html 2021-02-16 22:32:29 +03:00
Степаненко Ольга aec21260e6 Merge branch 'develop' into feature/documentation 2021-02-16 15:43:48 +03:00
Степаненко Ольга 6edb0d2c17 Add new context 2021-02-16 15:41:55 +03:00
Кравченко Артем f2a4d06a10 Merge branch 'feature/apiauth/research' into 'develop' 
#9 | Feature/apiauth/research

See merge request 2020-2021/online/s101/group-02/access_controller!7
 2021-02-16 11:38:49 +00:00
Степаненко Ольга c216b44b2a Make models documentation 2021-02-16 12:28:08 +03:00
Vadim Melnikov 8996c7d70a Added registration failed layout 2021-02-14 22:48:55 +03:00
Кравченко Артем 4555627bd3 Merge branch 'feature/profile' into 'develop' 
Add media to staticfiles, update `profile.html`

See merge request 2020-2021/online/s101/group-02/access_controller!6
 2021-02-11 18:31:09 +00:00
Sokurov Idar d91f5b8ba8 Add media to staticfiles, update profile.html 2021-02-11 21:26:02 +03:00
Andrew Smirnov 7e779733c2 Mode imgs from staticfiles to static folder 2021-02-11 21:04:24 +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 24551c7d41 Small code style improvements 2021-02-11 20:30:35 +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
Dmitriy Andreev fb75d10642 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-02-11 20:18:32 +03:00