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

352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Кравченко Артем
e9e089d713 Merge branch 'feature/notifications' into 'develop' 
Added notifications about role changes

See merge request 2020-2021/online/s101/group-02/access_controller!39
 2021-03-22 08:48:19 +00:00
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
Sokurov Idar
b50a6668a6 Merge branch 'develop' into feature/statistic/html 2021-03-18 22:59:40 +03:00
Artyom Kravchenko
271695f6f6 fixed start.sh 2021-03-18 20:53:22 +03: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
Artyom Kravchenko
3fc4cfa547 tmp commit docker fixed 2021-03-18 19:30:58 +03:00
Vadim Melnikov
bca39c7a5f Added work v2 layout 2021-03-18 18:48:58 +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
Степаненко Ольга
0a7b4fb1a7 Temporary vertion with non-working enchant 2021-03-18 17:03:30 +03:00
Степаненко Ольга
10e341fcbb Merge branch 'develop' into feature/documentation 
# Conflicts:
#	main/templates/registration/login.html
 2021-03-18 09:59:18 +03:00
Timofey Mazurov
14cf635d3b Changed logs.csv location 2021-03-17 16:16:09 +03:00
Timofey Mazurov
96a618f1b5 Merge branch 'develop' into feature/logging/func 2021-03-17 16:02:04 +03:00
Timofey Mazurov
9d0b6982db Added logging for control page, fully added logging to project 2021-03-17 16:01:39 +03:00
Timofey Mazurov
838d6926fc Fixed userprofile.custom_role_id updating issue in update_role, fixed userprofile.changed_by logging 2021-03-17 16:00:55 +03:00
Timofey Mazurov
67da8681e5 Fixed userprofile.custom_role_id updating issue in work_hand_over and work_become_engineer 2021-03-17 15:47:41 +03:00
Sokurov Idar
5ec2407211 Add ticket unassignment 2021-03-17 09:35:15 +03:00
Timofey Mazurov
259ab76cba Added csv file logging 2021-03-17 03:13:37 +03:00
Artyom Kravchenko
0d0c9ad941 add dockerfile and script 2021-03-15 21:31:39 +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
Timofey Mazurov
933ebb72d6 Updated database logging 2021-03-15 21:03:11 +03:00
Timofey Mazurov
644f4de1e9 Merge remote-tracking branch 'origin/feature/logging/func' into feature/logging/func 2021-03-15 19:38:25 +03:00
Timofey Mazurov
da53c34e50 Added logging to database 2021-03-15 19:38:09 +03:00
Timofey Mazurov
063c2bf17a Added default date to change_time field 2021-03-15 19:35:45 +03:00
Timofey Mazurov
0a86853838 Removed logging settings 2021-03-15 19:35:20 +03:00
Timofey Mazurov
46012f487b Merged develop into current 2021-03-15 19:09:45 +03: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
Timofey Mazurov
b8883cc857 Added logging to database 2021-03-14 21:27:26 +03:00
Timofey Mazurov
e193ae0f55 Added default date to change_time field 2021-03-14 20:34:46 +03:00
Timofey Mazurov
6f3356ad25 Removed logging settings 2021-03-14 20:33:57 +03: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
Степаненко Ольга
4f240e19f6 Add spelling settings and install tox but spelling is not still working 2021-03-14 16:30:14 +03:00
Степаненко Ольга
79b7418b61 Add enchant without correct working 2021-03-14 15:41:58 +03:00
Sokurov Idar
1cd8874e03 Merge branch 'develop' into hotfix/ticket_unassignment 
# Conflicts:
#	main/models.py
 2021-03-14 13:12:59 +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
Степаненко Ольга
d50a88e8bc Add params to extra_func 2021-03-12 18:38:03 +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