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

94 Commits

Author SHA1 Message Date
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
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
Степаненко Ольга
0413a2edaf Add apiauth and serializers docs 2021-03-23 20:55:30 +03:00
Степаненко Ольга
b483998686 Add views docs after pulling 2021-03-23 15:27:52 +03:00
Степаненко Ольга
ae9f41fd23 Merge branch 'develop' into feature/documentation 
# Conflicts:
#	main/extra_func.py
#	main/models.py
#	main/views.py
 2021-03-23 14:10:27 +03:00
Степаненко Ольга
252f3e8144 Change views docs 2021-03-23 13:53:00 +03:00
Yuriy Kulakov
a8ca0b0eae Added notificcations about role changes 2021-03-21 19:47:42 +03:00
Iurii Tatishchev
0c2e2d81bc
#43 | Add max agents setting. Spots left count on /work/<id> and /control/ 2021-03-19 23:45:08 -07:00
Sokurov Idar
358351d6da optimize imports 2021-03-18 20:19:08 +03:00
Sokurov Idar
e563475ecd Merge branch 'develop' into hotfix/ticket_unassignment 
# Conflicts:
#	access_controller/settings.py
#	main/extra_func.py
#	main/views.py
 2021-03-18 20:18:13 +03:00
Iurii Tatishchev
2bb2c9556b
fix ./manage.py migrate errors 2021-03-18 09:32:46 -07:00
Степаненко Ольга
0a7b4fb1a7 Temporary vertion with non-working enchant 2021-03-18 17:03:30 +03:00
Sokurov Idar
5ec2407211 Add ticket unassignment 2021-03-17 09:35:15 +03:00
Sokurov Idar
a430ee871d Add ticket unassignment(exclude solved tickets) 2021-03-14 17:13:41 +03:00
Степаненко Ольга
79b7418b61 Add enchant without correct working 2021-03-14 15:41:58 +03:00
Степаненко Ольга
c9ae302103 Add documentation to new forms, and first part of extra_func 2021-03-14 12:42:18 +03:00
Степаненко Ольга
be6005c4be Correct view documentation using typehints 2021-03-13 16:41:28 +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
Yuriy Kulakov
abe44fec5f Refactored some functions in AdminPageView 2021-03-12 13:01:41 +03:00
Andrew Smirnov
d2e76fdbd9
Update model, add documentation todos, add sampla code for logging. 2021-03-11 20:54:56 +03:00
Yuriy Kulakov
72b70cc585 Fixed bug with api response 2021-03-11 19:29:16 +03:00
Sokurov Idar
dd08821aea fix bag 2021-03-11 18:14:57 +03:00
Sokurov Idar
ef9d0fc721 Merge branch 'develop' into feature/statistic/backend 2021-03-11 17:31:02 +03:00
Sokurov Idar
b825bcdff3 Update class StatisticData 2021-03-11 17:30:55 +03:00
Iurii Tatishchev
c2d6a790f9
Add meta with permissions to UserProfile, fix ./manage.py migrate errors 2021-03-11 00:10:44 -08:00
Sokurov Idar
5efec2641a Refactor statistic page with class StatisticData 2021-03-09 00:53:11 +03:00
Sokurov Idar
ce55ec61e6 extract function for easier processing a list of emails in future 2021-03-08 22:48:31 +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
Sokurov Idar
49046022d7 small refactor: change variable`s names, add a bit documentation 2021-03-08 17:50:47 +03:00
Artyom Kravchenko
7ee8cc96af fixed get and end engineer role fuctions 2021-03-07 23:08:56 +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
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
5909750fcc
Remove todolist commant 2021-03-04 20:56:38 +03:00
Andrew Smirnov
a393c31a13
Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	main/views.py
 2021-03-04 20:56:02 +03:00
Andrew Smirnov
1d7ff524b0
Documentation fix 
Add enchant, remove intersphinx useless links, remove napoleon, fix todos
 2021-03-04 20:54:45 +03:00
Кулаков Юрий
fa3716c2df Merge branch 'develop' into feature/adm_ruleset/backend 2021-03-04 20:46:25 +03:00
Кулаков Юрий
9ddf1db2a3 Fixed bug with permissions 2021-03-04 20:45:55 +03:00