CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
542 Commits 2 Branches 0 Tags
master
Commit Graph
375 Commits
Author SHA1 Message Date
Andrew Smirnov 8039e286ef Fix tests.py, add migration, fix pylint 2021-05-20 20:11:53 +03:00
Andrew Smirnov c3fc3e0e4e Merge branch 'develop' into feature/pylint 
# Conflicts:
#	main/apiauth.py
#	main/tests.py
#	requirements/common.txt
#	requirements/dev.txt
 2021-05-20 19:58:30 +03:00
Andrew Smirnov 5748e3f842 Merge branch 'develop' into feature/statistic/month_name_bug 2021-05-20 19:43:39 +03:00
Кравченко Артем 9f8fd5f584 Merge branch 'feature/registration_failed/html' into 'develop' 
Feature/registration failed/html

See merge request 2020-2021/online/s101/group-02/access_controller!84
 2021-05-20 15:21:45 +00:00
Кравченко Артем 1453810fb8 Merge branch 'fix/profile_page_look' into 'develop' 
Fix/profile page look

See merge request 2020-2021/online/s101/group-02/access_controller!72
 2021-05-20 15:21:12 +00:00
Kanris d9f2842bfe Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-05-20 18:13:42 +03:00
Kanris 832889ec8a fixed bug password and token a mutually exclusive 2021-05-20 18:13:08 +03:00
Степаненко Ольга 029b602f96 Update docs (statistic, zendesk_admin) 2021-05-20 17:45:25 +03:00
Степаненко Ольга 1114c916e9 Update docs (views, extra_func, forms, models) 2021-05-20 16:19:42 +03:00
CaZzzer c95c0fe00b Delete unused main/apiauth.py 2021-05-19 21:46:30 -07:00
Мазуров ТимофейandCaZzzer e0ca38cd6d Issue #75 2021-05-19 22:57:37 +00:00
CaZzzer 0a9f57155c #71 | Тесты Получения Прав Легкого Агента 2021-05-19 22:16:58 +00:00
Степаненко Ольга 3443c60a5f Check spelling 2021-05-19 21:12:28 +03:00
Степаненко Ольга aba5d9d563 Rename parametrs to snack_case. Pylint 10. 2021-05-15 15:44:21 +03:00
Степаненко Ольга 0fd3c0fa1b Resolve C0415 and E5110 problems 2021-05-15 14:52:08 +03:00
Andrew Smirnov 95b685a812 Merge branch 'develop' into feature/statistic/month_name_bug 
# Conflicts:
#	main/extra_func.py
 2021-05-13 20:56:04 +03:00
Andrew Smirnov 354e3f7373 Fix tests.py 2021-05-13 20:55:10 +03:00
Andrew Smirnov 839a333691 Merge branch 'develop' into feature/pylint 
# Conflicts:
#	main/tests.py
#	main/views.py
#	main/zendesk_admin.py
#	requirements/common.txt
 2021-05-13 20:45:06 +03:00
Yuriy Kulakov 716af21f48 Merge branch 'feature/control_test' into feature/react_test 
# Conflicts:
#	.gitignore
#	main/tests.py
 2021-05-13 20:44:15 +03:00
Andrew Smirnov 8b70827f07 Merge branch 'develop' into feature/react_test 
# Conflicts:
#	main/templates/pages/adm_ruleset.html
#	static/main/js/control.js
 2021-05-13 20:02:27 +03:00
Andrew Smirnov 6d3e4a0ac8 Merge branch 'develop' into fix/profile_page_look 2021-05-13 19:58:26 +03:00
Andrew Smirnov c1329e6788 Merge branch 'develop' into feature/registration_failed/html 2021-05-13 19:57:44 +03:00
Andrew Smirnov 23eb2bf2ec Fix month display on statistics page 2021-05-13 19:55:21 +03:00
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