|
|
cc08c0171b
|
Merge branch 'develop' into feature/docker
|
2021-04-15 09:40:00 -07:00 |
|
|
|
508324c62c
|
Move email, secrets, run params to env. Update README.md
|
2021-04-09 01:34:19 -07:00 |
|
Кравченко Артем
|
5001d1c71d
|
Merge branch 'feature/statistic/main' into 'develop'
Feature/statistic/main
See merge request 2020-2021/online/s101/group-02/access_controller!42
|
2021-04-06 14:35:38 +00:00 |
|
Timofey Mazurov
|
17328650c8
|
Fixed control page role changing
|
2021-03-30 00:45:32 +03:00 |
|
Sokurov Idar
|
f47840f292
|
small refactoring
|
2021-03-29 22:37:18 +03:00 |
|
Степаненко Ольга
|
a4a797aa40
|
Make spelling
|
2021-03-27 16:32:44 +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 |
|
Yuriy Kulakov
|
a8ca0b0eae
|
Added notificcations about role changes
|
2021-03-21 19:47:42 +03: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 |
|
Степаненко Ольга
|
0a7b4fb1a7
|
Temporary vertion with non-working enchant
|
2021-03-18 17:03:30 +03:00 |
|
Sokurov Idar
|
5ec2407211
|
Add ticket unassignment
|
2021-03-17 09:35:15 +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 |
|
Степаненко Ольга
|
c9ae302103
|
Add documentation to new forms, and first part of extra_func
|
2021-03-14 12:42:18 +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
|
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 |
|
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
|
b825bcdff3
|
Update class StatisticData
|
2021-03-11 17:30:55 +03: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
|
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 |
|
Yuriy Kulakov
|
8488ea88c2
|
Added Django REST but have some bugs
|
2021-03-07 21:30:02 +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
|
1d7ff524b0
|
Documentation fix
Add enchant, remove intersphinx useless links, remove napoleon, fix todos
|
2021-03-04 20:54:45 +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 |
|
Степаненко Ольга
|
525a5a61d2
|
Change extra_func documentation
|
2021-03-02 16:52:20 +03:00 |
|
Степаненко Ольга
|
edbe0a66af
|
Change extra_func documentation
|
2021-03-02 15:10:28 +03:00 |
|
Степаненко Ольга
|
4a9b3d71a4
|
Add typehints
|
2021-03-02 12:30:56 +03:00 |
|
Кулаков Юрий
|
8df2b66b7a
|
Added engineers and light_agents count from organization to control page
|
2021-02-25 21:57:04 +03:00 |
|
Кулаков Юрий
|
a12476ff70
|
changed function name
|
2021-02-25 20:41:05 +03:00 |
|
Кулаков Юрий
|
62b4b912e8
|
changed function name
|
2021-02-25 20:38:29 +03:00 |
|
Andrew Smirnov
|
7bb3bf79f1
|
Small codestyle fixes
|
2021-02-25 20:31:35 +03:00 |
|
Yuriy Kulakov
|
918306aa48
|
Merge branch 'develop' into feature/adm_ruleset/backend
# Conflicts:
# access_controller/settings.py
# access_controller/urls.py
# main/forms.py
# main/views.py
|
2021-02-25 18:41:08 +03:00 |
|
Artyom Kravchenko
|
b0932c94b6
|
merge registration branch
|
2021-02-25 14:17:36 +03:00 |
|
Yuriy Kulakov
|
baf02cca44
|
Added user list function
|
2021-02-23 19:46:43 +03:00 |
|
