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 |
|
Yuriy Kulakov
|
a434a4a30b
|
Merge feature/periodic into develop
|
2021-03-12 15:39:54 +03:00 |
|
Yuriy Kulakov
|
d300cc2f06
|
Merge branch 'develop' into feature/periodic
# Conflicts:
# access_controller/settings.py
# access_controller/urls.py
# main/extra_func.py
# main/views.py
|
2021-03-12 15:37:50 +03:00 |
|
Yuriy Kulakov
|
c1a10b6f2c
|
Fixed bug with disappearance of table rows in control page at start
|
2021-03-12 14:54:57 +03:00 |
|
Artyom Kravchenko
|
f6948d016d
|
add some design to menu template(logo and color)
|
2021-03-12 14:39:51 +03:00 |
|
Sokurov Idar
|
60e1da2825
|
12-hour working day
|
2021-03-11 19:17:11 +03:00 |
|
Kiselev Igor
|
9b6238fa45
|
1/2 partof statistic.html
|
2021-03-11 19:03:45 +03:00 |
|
Sokurov Idar
|
dd08821aea
|
fix bag
|
2021-03-11 18:14:57 +03:00 |
|
Sokurov Idar
|
5efec2641a
|
Refactor statistic page with class StatisticData
|
2021-03-09 00:53:11 +03:00 |
|
Sokurov Idar
|
811ea45532
|
Merge branch 'develop' into feature/statistic/backend
|
2021-03-08 21:07:32 +03:00 |
|
Sokurov Idar
|
b96deab2cb
|
Update statistic backend
|
2021-03-08 21:07:09 +03:00 |
|
Artyom Kravchenko
|
b01f5fb236
|
add button from menu for engineer rules request
|
2021-03-08 02:28:00 +03:00 |
|
Yuriy Kulakov
|
8488ea88c2
|
Added Django REST but have some bugs
|
2021-03-07 21:30:02 +03:00 |
|
Artyom Kravchenko
|
fe944f4875
|
Fixed info bug on page
|
2021-03-06 01:36:19 +03:00 |
|
Vadim Melnikov
|
4ab15526ee
|
Final registration failed html page
|
2021-03-05 14:31:45 +03:00 |
|
Sokurov Idar
|
4a604f0941
|
Merge branch 'develop' into feature/statistic/backend
# Conflicts:
# access_controller/urls.py
# main/forms.py
# main/views.py
|
2021-03-04 23:16:21 +03:00 |
|
Sokurov Idar
|
8566e2b5b6
|
Updated version with days iteration
|
2021-03-04 23:13:10 +03:00 |
|
Andrew Smirnov
|
656081295e
|
Profile view page refactoring
|
2021-03-04 20:01:10 +03:00 |
|
Yuriy Kulakov
|
1fac1b4835
|
Merge branch 'develop' into feature/adm_ruleset/backend
# Conflicts:
# main/views.py
|
2021-03-04 18:32:08 +03:00 |
|
Yuriy Kulakov
|
d46b90010d
|
Added permissions system to control page
|
2021-03-04 18:22:49 +03:00 |
|
Sokurov Idar
|
fd1e048ebe
|
statistic backend first version
|
2021-03-04 01:25:56 +03:00 |
|
Andrey Kovalev
|
09a423060c
|
Merge 'develop' into 'feature/work/backend'
|
2021-03-02 20:19:42 +03:00 |
|
Andrey Kovalev
|
f7522c9c69
|
Fix page html code
|
2021-02-28 17:27:07 +03:00 |
|
Vadim Melnikov
|
c9875596c0
|
Improved registration failed html a bit
|
2021-02-26 18:18:33 +03:00 |
|
Кулаков Юрий
|
8df2b66b7a
|
Added engineers and light_agents count from organization to control page
|
2021-02-25 21:57:04 +03:00 |
|
Andrew Smirnov
|
7bb3bf79f1
|
Small codestyle fixes
|
2021-02-25 20:31:35 +03:00 |
|
Vadim Melnikov
|
d3313c7ecf
|
Added kind of dirty registration failed html
|
2021-02-25 18:52:57 +03:00 |
|
Yuriy Kulakov
|
918306aa48
|
Merge branch 'develop' into feature/adm_ruleset/backend
# Conflicts:
# access_controller/settings.py
# access_controller/urls.py
# main/forms.py
# main/views.py
|
2021-02-25 18:41:08 +03:00 |
|
Artyom Kravchenko
|
61ea10f1d2
|
test role change
|
2021-02-25 18:24:14 +03:00 |
|
Artyom Kravchenko
|
b0932c94b6
|
merge registration branch
|
2021-02-25 14:17:36 +03:00 |
|
Yuriy Kulakov
|
baf02cca44
|
Added user list function
|
2021-02-23 19:46:43 +03:00 |
|
Сокуров Идар
|
25734d847f
|
Add password reset
|
2021-02-23 09:01:32 +00:00 |
|
Yuriy Kulakov
|
034c3eed70
|
Added admin control page
|
2021-02-21 21:35:36 +03:00 |
|
