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
|
656081295e
|
Profile view page refactoring
|
2021-03-04 20:01:10 +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 |
|
Andrey Kovalev
|
09a423060c
|
Merge 'develop' into 'feature/work/backend'
|
2021-03-02 20:19:42 +03:00 |
|
Andrey Kovalev
|
f7522c9c69
|
Fix page html code
|
2021-02-28 17:27:07 +03:00 |
|
Кулаков Юрий
|
8df2b66b7a
|
Added engineers and light_agents count from organization to control page
|
2021-02-25 21:57:04 +03:00 |
|
Andrew Smirnov
|
7bb3bf79f1
|
Small codestyle fixes
|
2021-02-25 20:31:35 +03:00 |
|
Artyom Kravchenko
|
61ea10f1d2
|
test role change
|
2021-02-25 18:24:14 +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 |
|
Ivan Pesnya
|
d19cfd103d
|
done!
|
2021-02-18 20:51:34 +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 |
|
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 |
|
Sokurov Idar
|
21ab4bf6cc
|
Complete registration, small update profile.html
|
2021-02-16 22:32:29 +03:00 |
|
Sokurov Idar
|
d91f5b8ba8
|
Add media to staticfiles, update profile.html
|
2021-02-11 21:26:02 +03:00 |
|
Andrew Smirnov
|
8024d38e09
|
Fix non-existing profile avatar
|
2021-02-11 19:44:35 +03:00 |
|
Artyom Kravchenko
|
7a5c7faf91
|
resolve merge conflicts
|
2021-02-11 01:55:28 +03:00 |
|
Сокуров Идар
|
d686a1566e
|
Small fix profile.html
|
2021-02-07 14:13:50 +00:00 |
|
Dmitriy Andreev
|
972ee3e4d4
|
Added base html
|
2021-02-07 15:02:08 +03:00 |
|
Сокуров Идар
|
0583e350db
|
Add request access button
|
2021-02-06 12:27:45 +00:00 |
|
Sokurov Idar
|
981e793e3e
|
Add profile page and temporary base.html
|
2021-02-06 14:33:55 +03:00 |
|