Commit Graph
352 Commits
Author SHA1 Message Date
Kiselev Igor 5f88a4f297 Fixed statistic view date bug 2021-05-13 17:51:28 +03:00
Сокуров ИдарandCaZzzer 74f8b1ce1f Add profile tests 2021-05-13 04:57:51 +00:00
Сокуров ИдарandCaZzzer 76cd782ff4 Add get tickets tests 2021-05-13 04:49:02 +00:00
Степаненко Ольга a6ceae8240 Pylint 10 2021-05-12 20:34:52 +03:00
Сокуров ИдарandCaZzzer e19cbdb85a Add reset password tests 2021-05-11 05:56:39 +00:00
Степаненко Ольга f803d81caf Pylint for extra_func.py 2021-05-10 20:49:55 +03:00
Степаненко Ольга 015016bd6e Merge with "develop", begin to check again 2021-05-10 20:43:17 +03:00
Степаненко Ольга 492260dc79 Merge branch 'develop' into feature/pylint
# Conflicts:
#	main/extra_func.py
#	main/tests.py
#	main/views.py
2021-05-10 20:22:39 +03:00
Андреев ДмитрийandCaZzzer 63949dd54e Fix/header 2021-05-10 15:05:34 +00:00
Yuriy Kulakov e32f12019e Added control page tests and fixed bugs 2021-05-07 22:29:50 +03:00
CaZzzer e886004069 Remove unnecessary files. 2021-05-06 09:07:21 -07:00
CaZzzer be1bfdd259 Revert "Move main helper files to main/lib."
This reverts commit 6bc1c6d108.
2021-05-06 08:47:15 -07:00
CaZzzer d426e9a2c4 fix 2021-05-06 08:46:41 -07:00
CaZzzer 6bc1c6d108 Move main helper files to main/lib. 2021-05-06 08:45:15 -07:00
CaZzzer cc4c4ffdc2 Merge branch 'develop' into feature/profiling 2021-05-06 08:33:03 -07:00
Сокуров ИдарandCaZzzer 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
Степаненко Ольга 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
Степаненко Ольга 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
Степаненко Ольга 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
CaZzzer 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
Сокуров ИдарandCaZzzer 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
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
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 bac3cf4dfd Merge develop into feature/registration_failed/html 2021-04-29 20:03:04 +03: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
Степаненко Ольга 2e3e567d2d Use pylint for some files 2021-04-28 18:57:36 +03:00