19 Commits

Author SHA1 Message Date
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
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
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
Кравченко Артем
b2fdd42f45 Merge branch 'feature/registration' into 'develop'
Feature/registration

See merge request 2020-2021/online/s101/group-02/access_controller!3
2021-02-10 19:38:42 +00:00
Dmitriy Andreev
298baa3198 Added site logo 2021-02-10 21:18:38 +03:00
Sokurov Idar
938b9894fe Add Zendesk password check
Add Bootstrap to forms
Add custom form
2021-02-10 19:05:46 +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
Sokurov Idar
729c0bec7e Email on zendesk exist check 2021-02-08 20:12:24 +03:00
Sokurov Idar
16fd0e3983 Merge remote-tracking branch 'origin/feature/profile_page' into feature/registration
# Conflicts:
#	access_controller/urls.py
#	main/views.py
2021-02-08 19:12:51 +03:00
Sokurov Idar
b8e3d11c6f Add first version registration 2021-02-08 19:10:44 +03:00
Кулаков Юрий
f6193a837a Added authorization page 2021-02-07 20:17:27 +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