|
|
be1bfdd259
|
Revert "Move main helper files to main/lib."
This reverts commit 6bc1c6d1089ceadd24bcd10a809816a51abb5068.
|
2021-05-06 08:47:15 -07:00 |
|
|
|
d426e9a2c4
|
fix
|
2021-05-06 08:46:41 -07:00 |
|
|
|
6bc1c6d108
|
Move main helper files to main/lib.
|
2021-05-06 08:45:15 -07:00 |
|
|
|
3481a9891c
|
Merge branch 'feature/profiling' into 'develop'
Ускорение получения тикетов
See merge request 2020-2021/online/s101/group-02/access_controller!69
|
2021-05-06 15:37:23 +00:00 |
|
|
|
cc4c4ffdc2
|
Merge branch 'develop' into feature/profiling
|
2021-05-06 08:33:03 -07:00 |
|
|
|
881b6ffd55
|
Merge branch 'feature/tests/make_eng' into 'develop'
#70 | Test make engineer from work and control pages
See merge request 2020-2021/online/s101/group-02/access_controller!68
|
2021-05-06 15:22:58 +00:00 |
|
Сокуров Идар
|
0086d4909e
|
Feature/tests/make_eng from work and control pages
|
2021-05-06 15:22:57 +00:00 |
|
Степаненко Ольга
|
5ea0aa9454
|
Fix
|
2021-05-06 18:17:20 +03:00 |
|
Степаненко Ольга
|
0dc840bba7
|
Merge remote-tracking branch 'origin/feature/pylint' into feature/pylint
# Conflicts:
# README.md
# access_controller/settings.py
# main/extra_func.py
# main/models.py
# main/views.py
|
2021-05-06 18:10:57 +03:00 |
|
Степаненко Ольга
|
22d4833ae0
|
Pylint for lesson
|
2021-05-06 17:53:28 +03:00 |
|
Степаненко Ольга
|
8646e668c1
|
Pylint for extra_func
|
2021-05-06 17:36:38 +03:00 |
|
Степаненко Ольга
|
12db461b5d
|
Pylint for views
|
2021-05-06 16:42:15 +03:00 |
|
Степаненко Ольга
|
bb74072c32
|
Change set_context function, using **kwargs
|
2021-05-06 15:23:22 +03:00 |
|
Степаненко Ольга
|
b9cb22e2e5
|
Commit for lesson
|
2021-05-06 14:49:45 +03:00 |
|
Степаненко Ольга
|
e0b855d27a
|
Add ru tokenizer
|
2021-05-06 14:37:08 +03:00 |
|
Степаненко Ольга
|
0be4c1b1ca
|
Merge branch 'feature/pylint' into feature/documentation
|
2021-05-06 12:51:55 +03:00 |
|
Степаненко Ольга
|
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 |
|
