CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
377 Commits 2 Branches 0 Tags
cbe10e9be918c36052fa7650e24c7639cf1e7863
Commit Graph
94 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kanris cbe10e9be9 pull dev 2021-05-29 23:16:49 +03:00
Кравченко Артем 9f8fd5f584 Merge branch 'feature/registration_failed/html' into 'develop' 
Feature/registration failed/html

See merge request 2020-2021/online/s101/group-02/access_controller!84
 2021-05-20 15:21:45 +00:00
Кравченко Артем 1453810fb8 Merge branch 'fix/profile_page_look' into 'develop' 
Fix/profile page look

See merge request 2020-2021/online/s101/group-02/access_controller!72
 2021-05-20 15:21:12 +00:00
Kanris d9f2842bfe Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-05-20 18:13:42 +03:00
Kanris 832889ec8a fixed bug password and token a mutually exclusive 2021-05-20 18:13:08 +03:00
Кравченко Артем 96e5865d3b Merge branch 'feature/change_pswd_btn' into 'develop' 
Исправлены уведомления, добавлена страница смены пароля

See merge request 2020-2021/online/s101/group-02/access_controller!65
 2021-04-28 11:24:18 +00:00
Кравченко Артем 97ec66da2c Merge branch 'feature/table_design' into 'develop' 
Changed styles of inactive users in table

See merge request 2020-2021/online/s101/group-02/access_controller!63
 2021-04-28 11:23:47 +00:00
Кравченко Артем 1bb951dcda Merge branch 'feature/refactor' into 'develop' 
Zendesk API Query Optimizations and Refactor, Small Fixes

Closes #58

See merge request 2020-2021/online/s101/group-02/access_controller!62
 2021-04-22 07:05:23 +00:00
Кравченко Артем 38f1f14e7b Merge branch 'feature/notifications' into 'develop' 
Feature/notifications

See merge request 2020-2021/online/s101/group-02/access_controller!61
 2021-04-20 21:00:05 +00:00
Artyom Kravchenko 83939f6681 fixed permissions for statistic page 2021-04-20 10:53:45 +03:00
Кравченко Артем c7048f8ca6 Merge branch 'feature/docker' into 'develop' 
Feature/docker

See merge request 2020-2021/online/s101/group-02/access_controller!50
 2021-04-19 17:20:13 +00:00
Artyom Kravchenko b929502ace modified data.json 2021-04-19 20:05:56 +03:00
Artyom Kravchenko f4d4cffa9f tmp commit 2021-04-19 17:52:10 +03:00
Artyom Kravchenko b4c0ab0d67 Merge branch 'develop' into feature/dockerbuild 2021-04-19 14:46:12 +03:00
Artyom Kravchenko ecf32a0ae7 merge st_button 2021-04-19 13:39:43 +03:00
Кравченко Артем 8e5fdc6ad6 Merge branch 'feature/periodic_upgrade' into 'develop' 
Now the first column of table at control page is checkbox

See merge request 2020-2021/online/s101/group-02/access_controller!60
 2021-04-19 10:22:54 +00:00
Кравченко Артем 223241703f Merge branch 'feature/mail_field_fix' into 'develop' 
Mail field fix

See merge request 2020-2021/online/s101/group-02/access_controller!58
 2021-04-19 10:22:13 +00:00
Artyom Kravchenko afec8e59e4 merge take tickets 2021-04-15 18:47:58 +03:00
Artyom Kravchenko 423951b144 merge button colors 2021-04-14 10:35:47 +03:00
Artyom Kravchenko 22f1d1394a Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-04-14 09:23:29 +03:00
Кравченко Артем fa239e6010 Merge branch 'feature/registration_bug' into 'develop' 
Feature/registration bug. Issue #59

See merge request 2020-2021/online/s101/group-02/access_controller!55
 2021-04-14 06:21:11 +00:00
Кравченко Артем 1fc337ab18 Merge branch 'feature/log_bug' into 'develop' 
Add directory for logs. Issue #60

See merge request 2020-2021/online/s101/group-02/access_controller!54
 2021-04-14 06:20:27 +00:00
Artyom Kravchenko 919e49ec45 resolve conflicts 2021-04-13 15:14:20 +03:00
Artyom Kravchenko 8dd0d0eec4 refactor view for work page 2021-04-13 15:10:50 +03:00
Кравченко Артем 7b49f45703 Merge branch 'feature/periodic_upgrade' into 'develop' 
Control page displays all users from zendesk and db

See merge request 2020-2021/online/s101/group-02/access_controller!52
 2021-04-13 12:01:29 +00:00
Кравченко Артем 5387962406 Merge branch 'feature/additional_env' into 'feature/docker' 
#53 | Move email, secrets, run params to env. Update README.md

See merge request 2020-2021/online/s101/group-02/access_controller!51
 2021-04-13 12:01:10 +00:00
Кравченко Артем 0ef60f0e65 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!49
 2021-04-13 12:00:08 +00:00
Кравченко Артем 4e3804d7e7 Merge branch 'feature/logging/func' into 'develop' 
Feature/logging/func

See merge request 2020-2021/online/s101/group-02/access_controller!36
 2021-04-13 11:59:48 +00:00
Artyom Kravchenko 300921704d merge dev 2021-04-08 15:59:26 +03:00
Artyom Kravchenko 0e6f016d1e Merge branch 'develop' into feature/docker 2021-04-08 15:45:43 +03:00
Artyom Kravchenko 19fc23808c test nginx 2021-04-08 15:39:47 +03:00
Artyom Kravchenko 2ea31e1594 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-04-06 18:04:22 +03:00
Artyom Kravchenko 870cbca99c tmp commit 2021-04-06 18:04:13 +03:00
Кравченко Артем 5001d1c71d Merge branch 'feature/statistic/main' into 'develop' 
Feature/statistic/main

See merge request 2020-2021/online/s101/group-02/access_controller!42
 2021-04-06 14:35:38 +00:00
Кравченко Артем 6f03526782 Merge branch 'feature/periodic_refactor' into 'develop' 
Removed django context, now uses only React

See merge request 2020-2021/online/s101/group-02/access_controller!48
 2021-04-06 14:35:24 +00:00
Artyom Kravchenko b3db81203f add daphne to requirements 2021-04-05 14:53:47 +03:00
Artyom Kravchenko d3d75a27bf add initiall migr 2021-04-02 14:59:31 +03:00
Кравченко Артем 575577642c Merge branch 'hotfix/fix_user_role_name' into 'develop' 
Fix user role display. Migrate to displayable roles, defined in settings.ZENDESK_ROLES

See merge request 2020-2021/online/s101/group-02/access_controller!47
 2021-04-01 17:47:27 +00:00
Кравченко Артем 59882094bd Update README.md 2021-04-01 17:01:38 +00:00
Artyom Kravchenko ff8834f22d fixed migrations bug 2021-03-31 15:02:37 +03:00
Artyom Kravchenko e377e64395 db bug 2021-03-31 12:23:55 +03:00
Artyom Kravchenko 86e3bd3077 add db to dockerignore 2021-03-31 12:22:47 +03:00
Artyom Kravchenko 7de09037c1 add env params 2021-03-31 10:54:16 +03:00
Artyom Kravchenko d58c1c9fd8 db path fixed 2021-03-30 23:30:31 +03:00
Artyom Kravchenko 4f106c4e17 merge dev 2021-03-30 17:32:35 +03:00
Artyom Kravchenko 2de8a5473a add dockerignore 2021-03-30 17:28:52 +03:00
Кравченко Артем 4dd48a5e4b Merge branch 'hotfix/role_view' into 'develop' 
Hotfix/role view

See merge request 2020-2021/online/s101/group-02/access_controller!43
 2021-03-29 21:58:39 +00:00
Artyom Kravchenko 697f21be45 fixed messages 2021-03-29 18:32:15 +03:00
Кравченко Артем 7cef5c3a86 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!41
 2021-03-27 17:31:26 +00:00
Artyom Kravchenko e96ee7ac5b modified setings for starting db with docker volume 2021-03-22 17:08:17 +03:00
Кравченко Артем e9e089d713 Merge branch 'feature/notifications' into 'develop' 
Added notifications about role changes

See merge request 2020-2021/online/s101/group-02/access_controller!39
 2021-03-22 08:48:19 +00:00
Кравченко Артем 74823e6c26 Merge branch 'feature/licenses_remaining' into 'develop' 
#43 | Отображение Количества Свободных Мест на Роль Инженера

See merge request 2020-2021/online/s101/group-02/access_controller!38
 2021-03-20 12:24:33 +00:00
Artyom Kravchenko 271695f6f6 fixed start.sh 2021-03-18 20:53:22 +03:00
Artyom Kravchenko 7e2e6a7ab7 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-03-18 20:48:36 +03:00
Artyom Kravchenko da46d019cb add TODO 2021-03-18 20:48:06 +03:00
Кравченко Артем b4d91ecd06 Update README.md 2021-03-18 17:43:55 +00:00
Кравченко Артем 1bb8e44d03 Merge branch 'hotfix/ticket_unassignment' into 'develop' 
Hotfix/ticket unassignment

See merge request 2020-2021/online/s101/group-02/access_controller!35
 2021-03-18 17:21:04 +00:00
Artyom Kravchenko 3fc4cfa547 tmp commit docker fixed 2021-03-18 19:30:58 +03:00
Кравченко Артем 870ce45a63 Merge branch 'feature/periodic' into 'develop' 
Feature/periodic into develop

See merge request 2020-2021/online/s101/group-02/access_controller!33
 2021-03-18 14:24:19 +00:00
Artyom Kravchenko 0d0c9ad941 add dockerfile and script 2021-03-15 21:31:39 +03:00
Кравченко Артем bee14a628c Merge branch 'feature/fixture/backend' into 'develop' 
Added fixture with base users

See merge request 2020-2021/online/s101/group-02/access_controller!34
 2021-03-15 18:27:56 +00:00
Artyom Kravchenko f6948d016d add some design to menu template(logo and color) 2021-03-12 14:39:51 +03:00
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