Andrew Smirnov
|
9fcd1bb9f1
|
Merge branch 'develop' into feature/statistic/month_name_bug
|
2021-05-27 20:45:03 +03:00 |
|
Dmitriy Andreev
|
8b3f8b8b87
|
Page design became better for user. Changes in profile, work, control and statistic pages.
|
2021-05-26 17:47:32 +03:00 |
|
Dmitriy Andreev
|
72030040b8
|
Fix looking of profile, work and control pages
|
2021-05-26 17:05:48 +03:00 |
|
Dmitriy Andreev
|
bdd5a68b26
|
profile look fix
|
2021-05-26 15:34:28 +03:00 |
|
Andrew Smirnov
|
c3fc3e0e4e
|
Merge branch 'develop' into feature/pylint
# Conflicts:
# main/apiauth.py
# main/tests.py
# requirements/common.txt
# requirements/dev.txt
|
2021-05-20 19:58:30 +03:00 |
|
Andrew Smirnov
|
5748e3f842
|
Merge branch 'develop' into feature/statistic/month_name_bug
|
2021-05-20 19:43:39 +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 |
|
Степаненко Ольга
|
aba5d9d563
|
Rename parametrs to snack_case. Pylint 10.
|
2021-05-15 15:44:21 +03:00 |
|
Andrew Smirnov
|
95b685a812
|
Merge branch 'develop' into feature/statistic/month_name_bug
# Conflicts:
# main/extra_func.py
|
2021-05-13 20:56:04 +03:00 |
|
Andrew Smirnov
|
6d3e4a0ac8
|
Merge branch 'develop' into fix/profile_page_look
|
2021-05-13 19:58:26 +03:00 |
|
Andrew Smirnov
|
c1329e6788
|
Merge branch 'develop' into feature/registration_failed/html
|
2021-05-13 19:57:44 +03:00 |
|
Andrew Smirnov
|
23eb2bf2ec
|
Fix month display on statistics page
|
2021-05-13 19:55:21 +03:00 |
|
Kiselev Igor
|
5f88a4f297
|
Fixed statistic view date bug
|
2021-05-13 17:51:28 +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 |
|
Сокуров Идар
|
0086d4909e
|
Feature/tests/make_eng from work and control pages
|
2021-05-06 15:22:57 +00:00 |
|
Andrew Smirnov
|
edd103b782
|
Merge branch 'develop' into feature/profile_page_lookfix
|
2021-04-29 20:13:47 +03:00 |
|
Andrew Smirnov
|
bac3cf4dfd
|
Merge develop into feature/registration_failed/html
|
2021-04-29 20:03:04 +03:00 |
|
Dmitriy Andreev
|
6b9cd05227
|
Profile page lookfix
|
2021-04-28 22:21:37 +03:00 |
|
Sokurov Idar
|
b2e7c84913
|
change notifications duration
|
2021-04-26 22:00:38 +03:00 |
|
Sokurov Idar
|
5c3801c317
|
Add password change page
|
2021-04-26 21:47:45 +03:00 |
|
Sokurov Idar
|
05a4bc70f2
|
minor fix
|
2021-04-20 23:01:31 +03: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
|
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 |
|
Andrew Smirnov
|
06256c202d
|
Fix statistic html
|
2021-04-15 20:28:43 +03: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 |
|
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 |
|
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 |
|
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
|
3aa84cd04c
|
Fixed role display on profile and admin pages
|
2021-03-30 00:29:47 +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 |
|
Andrey Kovalev
|
c097fc797e
|
Add get tickets
|
2021-03-25 21:16:19 +03:00 |
|
Yuriy Kulakov
|
a8ca0b0eae
|
Added notificcations about role changes
|
2021-03-21 19:47:42 +03:00 |
|
|
|
0c2e2d81bc
|
#43 | Add max agents setting. Spots left count on /work/<id> and /control/
|
2021-03-19 23:45:08 -07:00 |
|
Sokurov Idar
|
b50a6668a6
|
Merge branch 'develop' into feature/statistic/html
|
2021-03-18 22:59:40 +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 |
|
Kiselev Igor
|
18ff4a529f
|
Added statistic.html
|
2021-03-15 05:20:39 +03:00 |
|
Kiselev Igor
|
95c52f9302
|
Added and modified statistic.html
|
2021-03-15 05:18:08 +03:00 |
|
Yuriy Kulakov
|
e75e93287e
|
Added fixture with base users
|
2021-03-14 17:54:55 +03:00 |
|
