CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
504 Commits 2 Branches 0 Tags
e5e6541ac894f658d4f78718f51115accfdef896
Commit Graph
348 Commits
Author SHA1 Message Date
Artyom Kravchenko fe944f4875 Fixed info bug on page 2021-03-06 01:36:19 +03:00
Vadim Melnikov 4ab15526ee Final registration failed html page 2021-03-05 14:31:45 +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 8566e2b5b6 Updated version with days iteration 2021-03-04 23:13:10 +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
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
Кравченко Артем 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
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
Andrey Kovalev f7522c9c69 Fix page html code 2021-02-28 17:27:07 +03:00
Vadim Melnikov c9875596c0 Improved registration failed html a bit 2021-02-26 18:18:33 +03: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
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
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