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

120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Кравченко Артем
ba548ded2e Merge branch 'feature/adm_ruleset/backend' into 'develop' 
Feature/adm ruleset/backend

See merge request 2020-2021/online/s101/group-02/access_controller!29
 2021-03-04 17:50:44 +00: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
Кравченко Артем
3a448a399a Merge branch 'feature/adm_ruleset/backend' into 'develop' 
Feature/adm ruleset/backend

See merge request 2020-2021/online/s101/group-02/access_controller!28
 2021-03-04 16:20:17 +00: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
Кравченко Артем
dbe49d1c34 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!27
 2021-03-04 13:06:14 +00: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
Artyom Kravchenko
6cdd787cc8 add typehints to requirements 2021-03-03 13:46:44 +03:00
Кравченко Артем
b84824f888 Merge branch 'feature/registration' into 'develop' 
Feature/registration

See merge request 2020-2021/online/s101/group-02/access_controller!26
 2021-03-02 20:10:29 +00: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
Кравченко Артем
401b43e933 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!25
 2021-03-02 18:15:52 +00:00
Кравченко Артем
5f3684ef64 Merge branch 'feature/work/backend' into 'develop' 
Feature/work/backend

See merge request 2020-2021/online/s101/group-02/access_controller!24
 2021-03-02 18:15:16 +00:00
Andrey Kovalev
09a423060c Merge 'develop' into 'feature/work/backend' 2021-03-02 20:19:42 +03:00
Степаненко Ольга
525a5a61d2 Change extra_func documentation 2021-03-02 16:52:20 +03:00
Степаненко Ольга
edbe0a66af Change extra_func documentation 2021-03-02 15:10:28 +03:00
Степаненко Ольга
4a9b3d71a4 Add typehints 2021-03-02 12:30:56 +03:00
Степаненко Ольга
f9e6b79f01 Change models documentation using snippets 2021-03-02 09:52:18 +03:00
Степаненко Ольга
a64e641a33 Change conf using github snippet 2021-03-01 21:18:27 +03:00
Степаненко Ольга
cd50427532 Change conf 2021-03-01 20:52:39 +03:00
Степаненко Ольга
042e59a989 Change conf 2021-03-01 20:50:25 +03:00
Andrey Kovalev
f7522c9c69 Fix page html code 2021-02-28 17:27:07 +03:00
Кравченко Артем
1f55c66516 Merge branch 'feature/adm_ruleset/backend' into 'develop' 
Feature/adm ruleset/backend

See merge request 2020-2021/online/s101/group-02/access_controller!23
 2021-02-26 07:13:28 +00:00
Кулаков Юрий
8df2b66b7a Added engineers and light_agents count from organization to control page 2021-02-25 21:57:04 +03:00
Кулаков Юрий
a12476ff70 changed function name 2021-02-25 20:41:05 +03:00
Кулаков Юрий
62b4b912e8 changed function name 2021-02-25 20:38:29 +03:00
Andrew Smirnov
7bb3bf79f1
Small codestyle fixes 2021-02-25 20:31:35 +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
Кравченко Артем
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