Кравченко Артем
|
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 |
|
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 |
|
Сокуров Идар
|
76cd782ff4
|
Add get tickets tests
|
2021-05-13 04:49:02 +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 |
|
Yuriy Kulakov
|
fea4575562
|
Control page displays all users from zendesk and db
|
2021-04-11 17:35:42 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Artyom Kravchenko
|
61ea10f1d2
|
test role change
|
2021-02-25 18:24:14 +03:00 |
|
