Кравченко Артем
|
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 |
|
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 |
|
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 |
|