CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
142 Commits 2 Branches 0 Tags
bd500207a33b0d8b138e70ce5541e18cc52eaf1d
Commit Graph
32 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Artyom Kravchenko bd500207a3 Fixed AdminPageUSer form 2021-03-12 13:58:27 +03:00
Artyom Kravchenko 5665282ce5 fixed UserProfile model 2021-03-12 12:34:45 +03:00
Кравченко Артем 52f7858439 Merge branch 'feature/engineers_bug_page' into 'develop' 
Feature/engineers bug page

See merge request 2020-2021/online/s101/group-02/access_controller!31
 2021-03-08 13:41:54 +00:00
Artyom Kravchenko b01f5fb236 add button from menu for engineer rules request 2021-03-08 02:28:00 +03:00
Artyom Kravchenko 7ee8cc96af fixed get and end engineer role fuctions 2021-03-07 23:08:56 +03:00
Artyom Kravchenko fe944f4875 Fixed info bug on page 2021-03-06 01:36:19 +03:00
Кравченко Артем ba548ded2e Merge branch 'feature/adm_ruleset/backend' into 'develop' 
Feature/adm ruleset/backend

See merge request 2020-2021/online/s101/group-02/access_controller!29
 2021-03-04 17:50:44 +00:00
Кравченко Артем 3a448a399a Merge branch 'feature/adm_ruleset/backend' into 'develop' 
Feature/adm ruleset/backend

See merge request 2020-2021/online/s101/group-02/access_controller!28
 2021-03-04 16:20:17 +00:00
Кравченко Артем dbe49d1c34 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!27
 2021-03-04 13:06:14 +00:00
Artyom Kravchenko 6cdd787cc8 add typehints to requirements 2021-03-03 13:46:44 +03:00
Кравченко Артем b84824f888 Merge branch 'feature/registration' into 'develop' 
Feature/registration

See merge request 2020-2021/online/s101/group-02/access_controller!26
 2021-03-02 20:10:29 +00:00
Кравченко Артем 401b43e933 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!25
 2021-03-02 18:15:52 +00:00
Кравченко Артем 5f3684ef64 Merge branch 'feature/work/backend' into 'develop' 
Feature/work/backend

See merge request 2020-2021/online/s101/group-02/access_controller!24
 2021-03-02 18:15:16 +00:00
Кравченко Артем 1f55c66516 Merge branch 'feature/adm_ruleset/backend' into 'develop' 
Feature/adm ruleset/backend

See merge request 2020-2021/online/s101/group-02/access_controller!23
 2021-02-26 07:13:28 +00:00
Artyom Kravchenko 61ea10f1d2 test role change 2021-02-25 18:24:14 +03:00
Кравченко Артем a6c8910b63 Merge branch 'feature/password_reset' into 'develop' 
Кнопка восстановления пароля привязана к странице

See merge request 2020-2021/online/s101/group-02/access_controller!21
 2021-02-25 14:21:51 +00: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
Кравченко Артем 46dc0f6ab6 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!14
 2021-02-18 09:34:17 +00:00
Кравченко Артем 7708c0dbda Merge branch 'feature/logging/model' into 'develop' 
Added a model for logging user role changes

See merge request 2020-2021/online/s101/group-02/access_controller!12
 2021-02-17 22:33:47 +00:00
Кравченко Артем 227038ea38 Merge branch 'feature/work/html' into 'develop' 
Feature/work/html

See merge request 2020-2021/online/s101/group-02/access_controller!11
 2021-02-17 12:58:49 +00:00
Кравченко Артем fc88c70991 Merge branch 'feature/work/layout' into 'develop' 
Feature/work/layout

See merge request 2020-2021/online/s101/group-02/access_controller!9
 2021-02-16 22:27:26 +00:00
Кравченко Артем 54465848cf Merge branch 'feature/func_implement' into 'develop' 
Feature/func implement

See merge request 2020-2021/online/s101/group-02/access_controller!8
 2021-02-16 19:57:13 +00: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
Кравченко Артем 4555627bd3 Merge branch 'feature/profile' into 'develop' 
Add media to staticfiles, update `profile.html`

See merge request 2020-2021/online/s101/group-02/access_controller!6
 2021-02-11 18:31:09 +00: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
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