CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
315 Commits 2 Branches 0 Tags
68833ccdd52d2e53561185ad4229a05c8b1ac79d
Commit Graph
315 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Степаненко Ольга 06c499fcef Merge branch 'develop' into feature/documentation 2021-04-13 14:53:24 +03:00
Vadim Melnikov 7604c88777 Added highlight for login/register buttons a.k.a. finished the task 2021-04-12 22:14:04 +03:00
Yuriy Kulakov fea4575562 Control page displays all users from zendesk and db 2021-04-11 17:35:42 +03:00
Sokurov Idar 8c0a589173 Add SMTP error check 2021-04-11 01:12:07 +03:00
Timofey Mazurov 65253f6904 Fixed custom_role_id change for work page 2021-04-10 21:28:29 +03:00
CaZzzer 508324c62c Move email, secrets, run params to env. Update README.md 2021-04-09 01:34:19 -07:00
CaZzzer c9400e8f9e start.sh use daphne. Ignore extra files 2021-04-08 22:34:20 -07:00
CaZzzer 9bf3f20f24 Separate dev and prod requirements 2021-04-08 21:52:31 -07:00
Timofey Mazurov 9b1f04387c Merge branch 'develop' into feature/logging/func 
# Conflicts:
#	main/extra_func.py
#	main/models.py
#	main/views.py
 2021-04-08 21:04:27 +03:00
Степаненко Ольга ffe1f7b283 Modify pictures and description of new functions 2021-04-08 17:05:33 +03:00
Vadim Melnikov 2e6db096d6 Refactored menu.html so there's no copypaste 2021-04-08 16:18:25 +03: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
Степаненко Ольга baf0c7560b Input new pictures v2 2021-04-06 14:07:08 +03:00
Степаненко Ольга 90f92d8314 Input new pictures 2021-04-06 14:06:36 +03:00
Artyom Kravchenko b3db81203f add daphne to requirements 2021-04-05 14:53:47 +03:00
Yuriy Kulakov 30407e09dc Removed django context, now uses only React 2021-04-04 20:03:35 +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
Andrew Smirnov 3aaae33c44 Fix user role display. Migrate to displayable roles, defined in settings.ZENDESK_ROLES 2021-04-01 20:46:07 +03:00
CaZzzer 685fe35821 Merge branch 'feature/fix_work_page_css' into 'develop' 
#44 | Исправить Метку Выбора в Таблице Выбора Пользователей для Управления Правами

See merge request 2020-2021/online/s101/group-02/access_controller!46
 2021-04-01 17:06:29 +00:00
CaZzzer 603ba30d59 #44 | fix work.css form-check-input 2021-04-01 10:03:21 -07:00
Кравченко Артем 59882094bd Update README.md 2021-04-01 17:01:38 +00:00
Vadim Melnikov ef646a7b09 Deleted the testing leftovers 2021-04-01 18:24:49 +03:00
Vadim Melnikov 94b5061301 Added button highlights depending on current page 2021-04-01 18:12:13 +03: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
Timofey Mazurov 17328650c8 Fixed control page role changing 2021-03-30 00:45:32 +03:00
Timofey Mazurov c7c019f70b Merge branch 'develop' into hotfix/role_view 
# Conflicts:
#	main/views.py
 2021-03-30 00:39:28 +03:00
Timofey Mazurov 99979858f0 Deleted main page logging example 2021-03-30 00:30:38 +03:00
Timofey Mazurov 3aa84cd04c Fixed role display on profile and admin pages 2021-03-30 00:29:47 +03:00
Sokurov Idar f47840f292 small refactoring 2021-03-29 22:37:18 +03:00
Sokurov Idar 9e49a12524 Merge branch 'develop' into feature/statistic/main 
# Conflicts:
#	main/models.py
#	main/views.py
 2021-03-29 21:45:07 +03:00