CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
265 Commits 2 Branches 0 Tags
Commit Graph

265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Кравченко Артем
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
Yuriy Kulakov
af63ee29f3 Now the first column of table at control page is checkbox 2021-04-18 19:15:23 +03:00
Vadim Melnikov
4b8cd9c67f Fixed mail field in statistics page 2021-04-16 16:18:34 +03:00
Andrew Smirnov
06256c202d
Fix statistic html 2021-04-15 20:28:43 +03:00
Andrew Smirnov
0fbf666edd
Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-04-15 19:55:53 +03:00
Andrew Smirnov
18cc98f11a
Fix type hints 2021-04-15 19:55:34 +03:00
Iurii Tatishchev
f21eb2dcd4
minor fixes 2021-04-15 09:02:22 -07:00
Artyom Kravchenko
afec8e59e4 merge take tickets 2021-04-15 18:47:58 +03:00
Татищев Юрий
d9b24def1a Merge branch 'hotfix/gmail' into 'develop' 
Hotfix/gmail. Issue #57

See merge request 2020-2021/online/s101/group-02/access_controller!56
 2021-04-15 04:45:18 +00:00
Сокуров Идар
9543a2935c Hotfix/gmail. Issue #57 2021-04-15 04:45:18 +00: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
Sokurov Idar
2c14f65d4f Merge branch 'develop' into feature/registration_bug 
# Conflicts:
#	main/views.py
 2021-04-13 22:11:31 +03:00
Sokurov Idar
8a0a1639fc Add new page if email has not sent 2021-04-13 20:58:36 +03:00
Сокуров Идар
68b1f64d36 Change sequence of actions 2021-04-13 14:15:12 +00:00
Мазуров Тимофей
897cd1210b Add directory for logs. Issue #60 2021-04-13 13:51:06 +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
Кравченко Артем
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
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
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
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
Кравченко Артем
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
Татищев Юрий
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
Iurii Tatishchev
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
Кравченко Артем
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