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

169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuriy Kulakov
a8ca0b0eae Added notificcations about role changes 2021-03-21 19:47:42 +03:00
Кравченко Артем
74823e6c26 Merge branch 'feature/licenses_remaining' into 'develop' 
#43 | Отображение Количества Свободных Мест на Роль Инженера

See merge request 2020-2021/online/s101/group-02/access_controller!38
 2021-03-20 12:24:33 +00: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
Artyom Kravchenko
7e2e6a7ab7 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-03-18 20:48:36 +03:00
Artyom Kravchenko
da46d019cb add TODO 2021-03-18 20:48:06 +03:00
Кравченко Артем
b4d91ecd06 Update README.md 2021-03-18 17:43:55 +00:00
Кравченко Артем
1bb8e44d03 Merge branch 'hotfix/ticket_unassignment' into 'develop' 
Hotfix/ticket unassignment

See merge request 2020-2021/online/s101/group-02/access_controller!35
 2021-03-18 17:21:04 +00: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
Sokurov Idar
b5c3a12193 minor fix 2021-03-18 20:07:21 +03:00
Iurii Tatishchev
2bb2c9556b
fix ./manage.py migrate errors 2021-03-18 09:32:46 -07: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
Sokurov Idar
5ec2407211 Add ticket unassignment 2021-03-17 09:35:15 +03:00
Кравченко Артем
bee14a628c Merge branch 'feature/fixture/backend' into 'develop' 
Added fixture with base users

See merge request 2020-2021/online/s101/group-02/access_controller!34
 2021-03-15 18:27:56 +00:00
Yuriy Kulakov
e75e93287e Added fixture with base users 2021-03-14 17:54:55 +03:00
Sokurov Idar
0cc788c039 minor fix 2021-03-14 17:26:41 +03:00
Sokurov Idar
a430ee871d Add ticket unassignment(exclude solved tickets) 2021-03-14 17:13:41 +03:00
Sokurov Idar
1cd8874e03 Merge branch 'develop' into hotfix/ticket_unassignment 
# Conflicts:
#	main/models.py
 2021-03-14 13:12:59 +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
Artyom Kravchenko
bd500207a3 Fixed AdminPageUSer form 2021-03-12 13:58:27 +03:00
Yuriy Kulakov
abe44fec5f Refactored some functions in AdminPageView 2021-03-12 13:01:41 +03:00
Artyom Kravchenko
5665282ce5 fixed UserProfile model 2021-03-12 12:34:45 +03:00
Andrew Smirnov
d2e76fdbd9
Update model, add documentation todos, add sampla code for logging. 2021-03-11 20:54:56 +03:00
Andrew Smirnov
674df0e66b
Add model for tracking unassigned tickets 2021-03-11 20:28:04 +03:00
Sokurov Idar
9068febd30 bugfix 2021-03-11 19:55:09 +03:00
Yuriy Kulakov
72b70cc585 Fixed bug with api response 2021-03-11 19:29:16 +03:00
Sokurov Idar
60e1da2825 12-hour working day 2021-03-11 19:17:11 +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
Татищев Юрий
7085532915 Merge branch 'bug/migrations' into 'develop' 
#46 | Ошибка при запуске `./manage.py migrate`

See merge request 2020-2021/online/s101/group-02/access_controller!32
 2021-03-11 08:17:11 +00:00
Iurii Tatishchev
c2d6a790f9
Add meta with permissions to UserProfile, fix ./manage.py migrate errors 2021-03-11 00:10:44 -08:00
Iurii Tatishchev
3c43e0e38a
Add models help text migration 2021-03-11 00:04:05 -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
Кравченко Артем
52f7858439 Merge branch 'feature/engineers_bug_page' into 'develop' 
Feature/engineers bug page

See merge request 2020-2021/online/s101/group-02/access_controller!31
 2021-03-08 13:41:54 +00:00
Artyom Kravchenko
b01f5fb236 add button from menu for engineer rules request 2021-03-08 02:28:00 +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