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 |
|
|
|
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 |
|
Timofey Mazurov
|
9d0b6982db
|
Added logging for control page, fully added logging to project
|
2021-03-17 16:01:39 +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
|
46012f487b
|
Merged develop into current
|
2021-03-15 19:09:45 +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 |
|
|
|
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 |
|
Andrew Smirnov
|
656081295e
|
Profile view page refactoring
|
2021-03-04 20:01:10 +03:00 |
|
Yuriy Kulakov
|
525bb25697
|
Merge branch 'develop' into feature/adm_ruleset/backend
|
2021-03-04 19:06:45 +03:00 |
|
Yuriy Kulakov
|
1fac1b4835
|
Merge branch 'develop' into feature/adm_ruleset/backend
# Conflicts:
# main/views.py
|
2021-03-04 18:32:08 +03:00 |
|
Yuriy Kulakov
|
d46b90010d
|
Added permissions system to control page
|
2021-03-04 18:22:49 +03:00 |
|
Sokurov Idar
|
fd1e048ebe
|
statistic backend first version
|
2021-03-04 01:25:56 +03:00 |
|
Степаненко Ольга
|
2bfa6619b1
|
Merge branch 'develop' into feature/documentation
# Conflicts:
# main/forms.py
# requirements.txt
|
2021-03-03 21:02:40 +03:00 |
|
Степаненко Ольга
|
0cda9da311
|
Add views and forms documentation
|
2021-03-03 20:59:53 +03:00 |
|
Sokurov Idar
|
4299b1ed37
|
Merge branch 'develop' into feature/registration
# Conflicts:
# access_controller/urls.py
# main/extra_func.py
# main/forms.py
# main/views.py
|
2021-03-02 21:53:43 +03:00 |
|
Sokurov Idar
|
f50ce49d77
|
update login with email
|
2021-03-02 21:44:13 +03:00 |
|
Andrey Kovalev
|
09a423060c
|
Merge 'develop' into 'feature/work/backend'
|
2021-03-02 20:19:42 +03:00 |
|
Andrey Kovalev
|
f7522c9c69
|
Fix page html code
|
2021-02-28 17:27:07 +03:00 |
|
Кулаков Юрий
|
8df2b66b7a
|
Added engineers and light_agents count from organization to control page
|
2021-02-25 21:57:04 +03:00 |
|
Andrew Smirnov
|
3337596749
|
Remove useless auth check
|
2021-02-25 20:05:04 +03:00 |
|
Yuriy Kulakov
|
8ac6b10af2
|
merged with develop
|
2021-02-25 19:31:26 +03:00 |
|
Andrey Kovalev
|
b1d42ece61
|
Fixed name parametrs in env
|
2021-02-25 19:01:09 +03:00 |
|
