Кравченко Артем
|
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 |
|
|
|
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 |
|
|
|
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 |
|
Кравченко Артем
|
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 |
|
Sokurov Idar
|
5ec2407211
|
Add ticket unassignment
|
2021-03-17 09:35:15 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
|
|
c2d6a790f9
|
Add meta with permissions to UserProfile, fix ./manage.py migrate errors
|
2021-03-11 00:10:44 -08:00 |
|
|
|
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 |
|
