 Кулаков Юрий
|
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 |
|
|
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 |
|
|
Кулаков Юрий
|
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 |
|
|
Yuriy Kulakov
|
8ac6b10af2
|
merged with develop
|
2021-02-25 19:31:26 +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 |
|
|
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 |
|
|
Кулаков Юрий
|
7e8bcb96e7
|
Added a model for logging user role changes
|
2021-02-17 20:30:57 +03:00 |
|
|
Кулаков Юрий
|
4326d12b5c
|
Login template now extends base/base.html
|
2021-02-09 23:42:23 +03:00 |
|
|
Кулаков Юрий
|
d4d7fe49f2
|
Merge branch 'feature/base/html' into feature/authorization
# Conflicts:
# access_controller/urls.py
|
2021-02-09 23:32:33 +03:00 |
|
|
Кулаков Юрий
|
d1dcb9b1bf
|
Added additional LoginView in the urls.py to define extra_context later
|
2021-02-07 20:28:15 +03:00 |
|
|
Кулаков Юрий
|
f6193a837a
|
Added authorization page
|
2021-02-07 20:17:27 +03:00 |
|