542 Commits

Author SHA1 Message Date
Andrew Smirnov
8c9b5a9cfa
Fix urls, update menu, codestyle improvements, add views in documentation 2021-02-11 20:58:07 +03:00
Andrew Smirnov
24551c7d41
Small code style improvements 2021-02-11 20:30:35 +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
Dmitriy Andreev
fb75d10642 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-02-11 20:18:32 +03:00
Dmitriy Andreev
f2d8161e84 Merge branch 'feature/base/html' 2021-02-11 20:16:37 +03:00
Andrew Smirnov
ac99a23a3b
Small code style improvements 2021-02-11 20:15:46 +03:00
Andrew Smirnov
c3f9e6626b
Add extra_funcs to documentation 2021-02-11 20:04:08 +03:00
Andrew Smirnov
8024d38e09
Fix non-existing profile avatar 2021-02-11 19:44:35 +03:00
ac446c7746
add type hint to ZenpyUser 2021-02-11 08:24:47 -08:00
20bac4eedf
#9 | initial api auth implementation 2021-02-11 00:35:35 -08:00
Artyom Kravchenko
7a5c7faf91 resolve merge conflicts 2021-02-11 01:55:28 +03:00
Artyom Kravchenko
c5bdb7cb6f add login_required to profile view 2021-02-11 00:02:22 +03:00
Artyom Kravchenko
9cdcdb7a0c fixed registrarion/requirements 2021-02-10 23:29: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
Кравченко Артем
c6cc62ee50 Merge branch 'feature/base/layout' into 'develop'
Added base.html layout

See merge request 2020-2021/online/s101/group-02/access_controller!2
2021-02-10 19:37:10 +00:00
Кравченко Артем
9a891d5dbe Merge branch 'feature/profile_page' into 'develop'
Feature/profile page

See merge request 2020-2021/online/s101/group-02/access_controller!1
2021-02-10 19:30:57 +00:00
Dmitriy Andreev
298baa3198 Added site logo 2021-02-10 21:18:38 +03:00
Sokurov Idar
8de78e06c4 Merge branch 'feature/registration' 2021-02-10 19:16:27 +03:00
Sokurov Idar
e5964f6eaf Merge branch 'feature/registration' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into feature/registration
# Conflicts:
#	main/views.py
2021-02-10 19:16:16 +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
Сокуров Идар
0bc34f8100 Update main/views.py, README.md files 2021-02-08 17:17:03 +00: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
Кулаков Юрий
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
Сокуров Идар
d686a1566e Small fix profile.html 2021-02-07 14:13:50 +00:00
Dmitriy Andreev
b5dfc4935c Added base.html layout 2021-02-07 15:10:45 +03: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
3d4a49a350 fix typo 2021-02-06 14:45:39 +03:00
Sokurov Idar
981e793e3e Add profile page and temporary base.html 2021-02-06 14:33:55 +03:00
Andrew Smirnov
2919761b2f
Fix README.md 2021-02-04 21:02:10 +03:00
Andrew Smirnov
5705afada1
Add issue templates 2021-02-04 20:59:55 +03:00
Andrew Smirnov
2e88fbae1c
Add sphinx documentation initial template 2021-02-04 20:49:40 +03:00
Andrew Smirnov
9b52630cf4
Add OneToOne relation, fix image dir path 2021-02-04 20:41:11 +03:00
Andrew Smirnov
5e5bec6028
Fix profile model. Add OneToOne relation, fix image dir path 2021-02-04 20:40:56 +03:00
Andrew Smirnov
234669242f
Add profile model, update requirements, readme and gitignore 2021-02-04 20:37:58 +03:00
Andrew Smirnov
6056a1e85b
Initial commit. Add django. 2021-02-04 20:01:35 +03:00
Смирнов Андрей Александрович
e37d472f5e Initial commit 2021-02-04 16:33:01 +00:00