Andrew Smirnov
|
c1329e6788
|
Merge branch 'develop' into feature/registration_failed/html
|
2021-05-13 19:57:44 +03:00 |
|
Сокуров Идар
|
76cd782ff4
|
Add get tickets tests
|
2021-05-13 04:49:02 +00:00 |
|
Андреев Дмитрий
|
63949dd54e
|
Fix/header
|
2021-05-10 15:05:34 +00:00 |
|
|
|
be1bfdd259
|
Revert "Move main helper files to main/lib."
This reverts commit 6bc1c6d1089ceadd24bcd10a809816a51abb5068.
|
2021-05-06 08:47:15 -07:00 |
|
|
|
6bc1c6d108
|
Move main helper files to main/lib.
|
2021-05-06 08:45:15 -07:00 |
|
|
|
cc4c4ffdc2
|
Merge branch 'develop' into feature/profiling
|
2021-05-06 08:33:03 -07:00 |
|
|
|
58717022c5
|
Merge branch 'hotfix/logs' into 'develop'
Added logging for work pages
See merge request 2020-2021/online/s101/group-02/access_controller!70
|
2021-05-05 23:54:13 +00:00 |
|
Timofey Mazurov
|
f77256937e
|
Added logging for work pages
|
2021-05-06 02:44:53 +03:00 |
|
Сокуров Идар
|
66339c4f6b
|
Add registration tests
|
2021-05-05 23:44:24 +00:00 |
|
Sokurov Idar
|
cf2e9ccf21
|
Add get group tickets requests
|
2021-05-06 00:41:20 +03:00 |
|
Andrew Smirnov
|
bac3cf4dfd
|
Merge develop into feature/registration_failed/html
|
2021-04-29 20:03:04 +03:00 |
|
Sokurov Idar
|
3019246935
|
Add custom ticket requests
|
2021-04-23 00:31:43 +03:00 |
|
|
|
974de20d5f
|
Merge branch 'develop' into feature/refactor
|
2021-04-20 15:45:58 -07:00 |
|
|
|
f65eb54652
|
Small views.py refactor
|
2021-04-20 15:39:55 -07:00 |
|
|
|
8d14f2e8b4
|
Fix some type hints, small ZendeskAdmin refactor
|
2021-04-20 15:19:02 -07:00 |
|
Сокуров Идар
|
30e4d93c81
|
Update views.py
|
2021-04-20 20:30:11 +00:00 |
|
|
|
750371e595
|
move ZendeskAdmin to separate file
|
2021-04-20 13:29:46 -07:00 |
|
Sokurov Idar
|
cff6443eca
|
Add notifications on work page, rebase already exists with notifications.js
|
2021-04-20 22:55:22 +03:00 |
|
Artyom Kravchenko
|
83939f6681
|
fixed permissions for statistic page
|
2021-04-20 10:53:45 +03:00 |
|
Artyom Kravchenko
|
ecf32a0ae7
|
merge st_button
|
2021-04-19 13:39:43 +03: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
|
2ec95dcb00
|
Added statistics button + fixed stats page buttons highlight
|
2021-04-16 16:14:37 +03:00 |
|
|
|
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 |
|
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 |
|
Кравченко Артем
|
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 |
|
Vadim Melnikov
|
94b5061301
|
Added button highlights depending on current page
|
2021-04-01 18:12:13 +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 |
|
