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

214 Commits

Author SHA1 Message Date
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
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
Vadim Melnikov
2ec95dcb00 Added statistics button + fixed stats page buttons highlight 2021-04-16 16:14:37 +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
13c1bbb27d
Merge branch 'develop' into feature/docker 2021-04-15 09:43:51 -07:00
Iurii Tatishchev
cc08c0171b
Merge branch 'develop' into feature/docker 2021-04-15 09:40:00 -07: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
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
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
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
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
Iurii Tatishchev
508324c62c
Move email, secrets, run params to env. Update README.md 2021-04-09 01:34:19 -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
0e6f016d1e Merge branch 'develop' into feature/docker 2021-04-08 15:45:43 +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
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
Andrew Smirnov
3aaae33c44
Fix user role display. Migrate to displayable roles, defined in settings.ZENDESK_ROLES 2021-04-01 20:46:07 +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
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
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
Sokurov Idar
6fd81c3ccc marge statistic/backend and statistic/frontend 2021-03-29 21:40:13 +03:00
Artyom Kravchenko
697f21be45 fixed messages 2021-03-29 18:32:15 +03:00
Степаненко Ольга
a4a797aa40 Make spelling 2021-03-27 16:32:44 +03:00