Commit Graph
16 Commits
Author SHA1 Message Date
CaZzzer cc08c0171b Merge branch 'develop' into feature/docker 2021-04-15 09:40:00 -07:00
Yuriy Kulakov a8ca0b0eae Added notificcations about role changes 2021-03-21 19:47:42 +03:00
Yuriy Kulakov d300cc2f06 Merge branch 'develop' into feature/periodic
# Conflicts:
#	access_controller/settings.py
#	access_controller/urls.py
#	main/extra_func.py
#	main/views.py
2021-03-12 15:37:50 +03:00
Artyom Kravchenko f6948d016d add some design to menu template(logo and color) 2021-03-12 14:39:51 +03:00
Artyom Kravchenko b01f5fb236 add button from menu for engineer rules request 2021-03-08 02:28:00 +03:00
Yuriy Kulakov 8488ea88c2 Added Django REST but have some bugs 2021-03-07 21:30:02 +03:00
Yuriy Kulakov d46b90010d Added permissions system to control page 2021-03-04 18:22:49 +03:00
Ivan Pesnya d19cfd103d done! 2021-02-18 20:51:34 +03:00
Andrew Smirnov 8c9b5a9cfa Fix urls, update menu, codestyle improvements, add views in documentation 2021-02-11 20:58:07 +03:00
Кравченко Артем ef36e8de40 Merge branch 'feature/base/html' into 'develop'
A few changes design of menu

See merge request 2020-2021/online/s101/group-02/access_controller!5
2021-02-11 17:28:55 +00:00
Artyom Kravchenko 7a5c7faf91 resolve merge conflicts 2021-02-11 01:55:28 +03:00
Dmitriy Andreev 298baa3198 Added site logo 2021-02-10 21:18:38 +03:00
Кулаков Юрий 4326d12b5c Login template now extends base/base.html 2021-02-09 23:42:23 +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
Sokurov Idar 981e793e3e Add profile page and temporary base.html 2021-02-06 14:33:55 +03:00