Степаненко Ольга
|
276c979b73
|
Change make_engineer
|
2021-05-06 12:51:40 +03:00 |
|
Степаненко Ольга
|
9c54fcca11
|
Merge branch 'feature/pylint' into feature/documentation
# Conflicts:
# main/extra_func.py
|
2021-05-06 12:44:12 +03:00 |
|
Степаненко Ольга
|
f24c94914f
|
Change User to get_user_model - fix problems
|
2021-05-06 12:43:44 +03:00 |
|
Yuriy Kulakov
|
fe33c8d042
|
Added some tests for control page
|
2021-05-06 12:30:14 +03:00 |
|
Степаненко Ольга
|
9c9b4dd08b
|
Change User to get_user_model
|
2021-05-06 12:26:45 +03:00 |
|
Степаненко Ольга
|
4b25ec4b33
|
Merge branch 'develop' into feature/pylint
# Conflicts:
# main/extra_func.py
# main/tests.py
|
2021-05-06 12:00:39 +03:00 |
|
Степаненко Ольга
|
ab275fe3f8
|
Remove second argument from light_agent and make_engineer functions
|
2021-05-06 11:56:11 +03:00 |
|
Степаненко Ольга
|
cd1196efb2
|
Merge with develop
|
2021-05-06 11:26:22 +03:00 |
|
Степаненко Ольга
|
af0c58c50b
|
Merge branch 'develop' into feature/documentation
# Conflicts:
# main/extra_func.py
# main/tests.py
|
2021-05-06 11:25:22 +03:00 |
|
Степаненко Ольга
|
4041790e6f
|
Spell new docs, create new README
|
2021-05-06 11:17:34 +03:00 |
|
|
|
58717022c5
|
Merge branch 'hotfix/logs' into 'develop'
Added logging for work pages
See merge request 2020-2021/online/s101/group-02/access_controller!70
|
2021-05-05 23:54:13 +00:00 |
|
Timofey Mazurov
|
f77256937e
|
Added logging for work pages
|
2021-05-06 02:44:53 +03:00 |
|
|
|
824077fbd9
|
Merge branch 'feature/register_tests' into 'develop'
#72 | Add registration tests
See merge request 2020-2021/online/s101/group-02/access_controller!64
|
2021-05-05 23:44:24 +00:00 |
|
Сокуров Идар
|
66339c4f6b
|
Add registration tests
|
2021-05-05 23:44:24 +00:00 |
|
Sokurov Idar
|
cf2e9ccf21
|
Add get group tickets requests
|
2021-05-06 00:41:20 +03:00 |
|
Dmitriy Andreev
|
75a1677f16
|
data.json fix
|
2021-05-05 20:57:48 +03:00 |
|
Dmitriy Andreev
|
9f0ccf23e7
|
Changes data.json in local
|
2021-05-05 20:43:25 +03:00 |
|
Yuriy Kulakov
|
79fb2412d6
|
Added webpack for js
|
2021-05-04 18:19:30 +03:00 |
|
Yuriy Kulakov
|
6a4756f3f9
|
Added some tests to the control page
|
2021-05-03 13:04:19 +03:00 |
|
Yuriy Kulakov
|
f4e5b9192e
|
Changed scripts' sources at control ppage
|
2021-04-30 20:55:42 +03:00 |
|
Yuriy Kulakov
|
c61fbaa2e7
|
Added js imports
|
2021-04-29 21:18:27 +03:00 |
|
Andrew Smirnov
|
010dff2f9d
|
Fix model docs and enchant spelling tokenizer
|
2021-04-29 21:08:11 +03:00 |
|
Andrew Smirnov
|
eb1ef72adb
|
Merge branch 'develop' into feature/pylint
# Conflicts:
# main/extra_func.py
|
2021-04-29 20:38:20 +03:00 |
|
Andrew Smirnov
|
eea8e0aab8
|
Pylint improvements
|
2021-04-29 20:37:38 +03:00 |
|
Andrew Smirnov
|
edd103b782
|
Merge branch 'develop' into feature/profile_page_lookfix
|
2021-04-29 20:13:47 +03:00 |
|
Andrew Smirnov
|
db9676358a
|
Merge branch 'develop' into feature/profiling
# Conflicts:
# main/extra_func.py
|
2021-04-29 20:12:00 +03:00 |
|
Andrew Smirnov
|
3c40cefdb6
|
Merge branch 'develop' into feature/work/layout
|
2021-04-29 20:06:48 +03:00 |
|
Andrew Smirnov
|
cf4a11a2c0
|
Merge branch 'develop' into feature/registration_success/layout
|
2021-04-29 20:04:05 +03:00 |
|
Andrew Smirnov
|
0204c923a1
|
Merge branch 'feature/registration_failed/layout' into feature/registration_failed/html
|
2021-04-29 20:03:19 +03:00 |
|
Andrew Smirnov
|
bac3cf4dfd
|
Merge develop into feature/registration_failed/html
|
2021-04-29 20:03:04 +03:00 |
|
Andrew Smirnov
|
a0c945ff68
|
Merge branch 'develop' into feature/registration_failed/layout
|
2021-04-29 19:57:41 +03:00 |
|
Смирнов Андрей Александрович
|
1889b6cdb7
|
Merge branch 'hotfix/make_light_agent_with_zero_tickets' into 'develop'
Fix make_light_agent method while tickets.count is 0.
See merge request 2020-2021/online/s101/group-02/access_controller!67
|
2021-04-29 16:53:06 +00:00 |
|
Andrew Smirnov
|
73e9c9fd34
|
Fix make_light_agent method while tickets.count is 0.
|
2021-04-29 19:52:03 +03:00 |
|
Yuriy Kulakov
|
82fde03db9
|
Merge branch 'develop' into feature/react_test
# Conflicts:
# static/main/js/control_page/control.js
|
2021-04-29 16:52:31 +03:00 |
|
Yuriy Kulakov
|
760d28a768
|
Update package.json
|
2021-04-29 16:33:41 +03:00 |
|
Dmitriy Andreev
|
6b9cd05227
|
Profile page lookfix
|
2021-04-28 22:21:37 +03:00 |
|
Степаненко Ольга
|
3155374185
|
Spell new docs
|
2021-04-28 21:17:41 +03:00 |
|
Степаненко Ольга
|
cc83f292de
|
Fix autopep8 problem
|
2021-04-28 19:36:21 +03:00 |
|
Степаненко Ольга
|
2e3e567d2d
|
Use pylint for some files
|
2021-04-28 18:57:36 +03:00 |
|
Степаненко Ольга
|
4666570177
|
Use pylint for zendesk_admin.py
|
2021-04-28 16:42:19 +03:00 |
|
Степаненко Ольга
|
e5460d90fc
|
Use pylint for models.py
|
2021-04-28 16:18:55 +03:00 |
|
Степаненко Ольга
|
a7dd7d84e0
|
Use pylint for extra_func.py
|
2021-04-28 15:39:25 +03:00 |
|
Степаненко Ольга
|
d828afc504
|
Merge branch 'develop' into feature/pylint
|
2021-04-28 14:27:27 +03:00 |
|
Кравченко Артем
|
96e5865d3b
|
Merge branch 'feature/change_pswd_btn' into 'develop'
Исправлены уведомления, добавлена страница смены пароля
See merge request 2020-2021/online/s101/group-02/access_controller!65
|
2021-04-28 11:24:18 +00:00 |
|
Кравченко Артем
|
97ec66da2c
|
Merge branch 'feature/table_design' into 'develop'
Changed styles of inactive users in table
See merge request 2020-2021/online/s101/group-02/access_controller!63
|
2021-04-28 11:23:47 +00:00 |
|
Степаненко Ольга
|
3b54a520cb
|
Use pylint for views
|
2021-04-28 14:15:40 +03:00 |
|
Степаненко Ольга
|
d8b15d087b
|
Add pylint settings - .pylintrc file
|
2021-04-28 11:53:29 +03:00 |
|
Yuriy Kulakov
|
0b73f4163e
|
Merge branch 'develop' into feature/react_test
|
2021-04-27 22:07:57 +03:00 |
|
Yuriy Kulakov
|
3b9ae4f2fa
|
Added django_node_assets
|
2021-04-27 20:24:58 +03:00 |
|
Степаненко Ольга
|
8e0610840d
|
Pylint 7.5
|
2021-04-27 19:41:47 +03:00 |
|
