 Timofey Mazurov
|
0a86853838
|
Removed logging settings
|
2021-03-15 19:35:20 +03:00 |
|
 Sokurov Idar
|
60e1da2825
|
12-hour working day
|
2021-03-11 19:17:11 +03:00 |
|
|
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 |
|
 Кулаков Юрий
|
9ddf1db2a3
|
Fixed bug with permissions
|
2021-03-04 20:45:55 +03:00 |
|
|
Sokurov Idar
|
fd1e048ebe
|
statistic backend first version
|
2021-03-04 01:25:56 +03:00 |
|
|
Sokurov Idar
|
4299b1ed37
|
Merge branch 'develop' into feature/registration
# Conflicts:
# access_controller/urls.py
# main/extra_func.py
# main/forms.py
# main/views.py
|
2021-03-02 21:53:43 +03:00 |
|
|
Sokurov Idar
|
f50ce49d77
|
update login with email
|
2021-03-02 21:44:13 +03:00 |
|
 Andrey Kovalev
|
09a423060c
|
Merge 'develop' into 'feature/work/backend'
|
2021-03-02 20:19:42 +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 |
|
 Artyom Kravchenko
|
61ea10f1d2
|
test role change
|
2021-02-25 18:24:14 +03:00 |
|
 Тонковид Роман
|
c71949dac6
|
Кнопка восстановления пароля привязана к странице
|
2021-02-25 16:13:49 +03:00 |
|
|
Artyom Kravchenko
|
b0932c94b6
|
merge registration branch
|
2021-02-25 14:17:36 +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 |
|
|
Sokurov Idar
|
8b512afadb
|
fix bug, update registration
|
2021-02-19 17:55:27 +03:00 |
|
|
Sokurov Idar
|
0953a0627e
|
Temporary
|
2021-02-18 20:58:10 +03:00 |
|
 Andrew Smirnov
|
ca1fab09c9
|
Add logging framework usage example
|
2021-02-18 20:45:56 +03:00 |
|
|
Sokurov Idar
|
b777d47041
|
Recreate registration v1
|
2021-02-18 19:22:10 +03:00 |
|
|
Andrey Kovalev
|
bf69c870cd
|
Add rights management backend
|
2021-02-17 20:43:57 +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
|
ac99a23a3b
|
Small code style improvements
|
2021-02-11 20:15:46 +03: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 |
|
|
Кулаков Юрий
|
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 |
|
|
Кулаков Юрий
|
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 |
|
|
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 |
|
|
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 |
|