Yuriy Kulakov
|
8ac6b10af2
|
merged with develop
|
2021-02-25 19:31:26 +03:00 |
|
Andrey Kovalev
|
b1d42ece61
|
Fixed name parametrs in env
|
2021-02-25 19:01:09 +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 |
|
Artyom Kravchenko
|
b0932c94b6
|
merge registration branch
|
2021-02-25 14:17:36 +03:00 |
|
Кравченко Артем
|
3f0aed5c73
|
Merge branch 'feature/adm_ruleset/html' into 'develop'
html шаблон страницы управления правами (админ)
See merge request 2020-2021/online/s101/group-02/access_controller!19
|
2021-02-25 08:49:51 +00:00 |
|
Yuriy Kulakov
|
baf02cca44
|
Added user list function
|
2021-02-23 19:46:43 +03:00 |
|
Сокуров Идар
|
25734d847f
|
Add password reset
|
2021-02-23 09:01:32 +00: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 |
|
Andrew Smirnov
|
e955dfab99
|
Fix registrationForm (add is_valid call)
|
2021-02-18 21:04:45 +03:00 |
|
Sokurov Idar
|
0953a0627e
|
Temporary
|
2021-02-18 20:58:10 +03:00 |
|
Ivan Pesnya
|
d19cfd103d
|
done!
|
2021-02-18 20:51:34 +03:00 |
|
Andrew Smirnov
|
ca1fab09c9
|
Add logging framework usage example
|
2021-02-18 20:45:56 +03:00 |
|
Sokurov Idar
|
c2c1477983
|
small refactoring
|
2021-02-18 19:50:33 +03:00 |
|
Sokurov Idar
|
b777d47041
|
Recreate registration v1
|
2021-02-18 19:22:10 +03:00 |
|
Степаненко Ольга
|
ae5ed94bc9
|
Change extra_func documentation
|
2021-02-18 10:49:17 +03:00 |
|
Степаненко Ольга
|
774cbbe802
|
Fix warnings
|
2021-02-18 09:19:00 +03:00 |
|
Степаненко Ольга
|
61fa8761eb
|
Merge branch 'develop' into feature/documentation
# Conflicts:
# main/extra_func.py
|
2021-02-18 07:35:35 +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 |
|
Кулаков Юрий
|
7e8bcb96e7
|
Added a model for logging user role changes
|
2021-02-17 20:30: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
|
023eb69c0a
|
add models migration
|
2021-02-16 22:33:54 +03:00 |
|
Sokurov Idar
|
21ab4bf6cc
|
Complete registration, small update profile.html
|
2021-02-16 22:32:29 +03:00 |
|
Степаненко Ольга
|
aec21260e6
|
Merge branch 'develop' into feature/documentation
|
2021-02-16 15:43:48 +03:00 |
|
Степаненко Ольга
|
6edb0d2c17
|
Add new context
|
2021-02-16 15:41:55 +03:00 |
|
Кравченко Артем
|
f2a4d06a10
|
Merge branch 'feature/apiauth/research' into 'develop'
#9 | Feature/apiauth/research
See merge request 2020-2021/online/s101/group-02/access_controller!7
|
2021-02-16 11:38:49 +00:00 |
|
Степаненко Ольга
|
c216b44b2a
|
Make models documentation
|
2021-02-16 12:28:08 +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 |
|
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 |
|
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 |
|
Dmitriy Andreev
|
298baa3198
|
Added site logo
|
2021-02-10 21:18:38 +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 |
|
