 Artyom Kravchenko
|
d58c1c9fd8
|
db path fixed
|
2021-03-30 23:30:31 +03:00 |
|
|
Artyom Kravchenko
|
4f106c4e17
|
merge dev
|
2021-03-30 17:32:35 +03:00 |
|
 Timofey Mazurov
|
17328650c8
|
Fixed control page role changing
|
2021-03-30 00:45:32 +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 |
|
|
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 |
|
|
Степаненко Ольга
|
2ce272d206
|
Add models docs after pulling
|
2021-03-23 20:22:42 +03:00 |
|
|
Степаненко Ольга
|
b483998686
|
Add views docs after pulling
|
2021-03-23 15:27:52 +03:00 |
|
|
Степаненко Ольга
|
6c19ebdd3e
|
Add extra_func docs after pulling
|
2021-03-23 15:05:16 +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 |
|
|
Artyom Kravchenko
|
e96ee7ac5b
|
modified setings for starting db with docker volume
|
2021-03-22 17:08:17 +03:00 |
|
 Yuriy Kulakov
|
a8ca0b0eae
|
Added notificcations about role changes
|
2021-03-21 19:47:42 +03:00 |
|
 CaZzzer
|
0c2e2d81bc
|
#43 | Add max agents setting. Spots left count on /work/<id> and /control/
|
2021-03-19 23:45:08 -07:00 |
|
|
Artyom Kravchenko
|
da46d019cb
|
add TODO
|
2021-03-18 20:48:06 +03: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 |
|
|
CaZzzer
|
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 |
|
|
Степаненко Ольга
|
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 |
|
|
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 |
|
|
Степаненко Ольга
|
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 |
|
|
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 |
|
|
CaZzzer
|
c2d6a790f9
|
Add meta with permissions to UserProfile, fix ./manage.py migrate errors
|
2021-03-11 00:10:44 -08:00 |
|