Commit Graph
47 Commits
Author SHA1 Message Date
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 354e3f7373 Fix tests.py 2021-05-13 20:55:10 +03:00
Andrew Smirnov 561b7e3a44 Mode doc and style requirements in dev file 2021-05-13 20:46: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
Andrew Smirnov f893bc15fe Fix pylint exec cmd 2021-05-13 20:38:25 +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 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
Andrew Smirnov 06256c202d Fix statistic html 2021-04-15 20:28:43 +03:00
Andrew Smirnov 0fbf666edd Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-04-15 19:55:53 +03:00
Andrew Smirnov 18cc98f11a Fix type hints 2021-04-15 19:55:34 +03:00
Andrew Smirnov 3aaae33c44 Fix user role display. Migrate to displayable roles, defined in settings.ZENDESK_ROLES 2021-04-01 20:46:07 +03:00
Andrew Smirnov d2e76fdbd9 Update model, add documentation todos, add sampla code for logging. 2021-03-11 20:54:56 +03:00
Andrew Smirnov 674df0e66b Add model for tracking unassigned tickets 2021-03-11 20:28:04 +03:00
Andrew Smirnov 5909750fcc Remove todolist commant 2021-03-04 20:56:38 +03:00
Andrew Smirnov a393c31a13 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	main/views.py
2021-03-04 20:56:02 +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
Andrew Smirnov 656081295e Profile view page refactoring 2021-03-04 20:01:10 +03:00
Andrew Smirnov 7bb3bf79f1 Small codestyle fixes 2021-02-25 20:31:35 +03:00
Andrew Smirnov 3337596749 Remove useless auth check 2021-02-25 20:05:04 +03:00
Andrew Smirnov e955dfab99 Fix registrationForm (add is_valid call) 2021-02-18 21:04:45 +03:00
Andrew Smirnov ca1fab09c9 Add logging framework usage example 2021-02-18 20:45:56 +03:00
Andrew Smirnov 7e779733c2 Mode imgs from staticfiles to static folder 2021-02-11 21:04:24 +03:00
Andrew Smirnov 8c9b5a9cfa Fix urls, update menu, codestyle improvements, add views in documentation 2021-02-11 20:58:07 +03:00
Andrew Smirnov 24551c7d41 Small code style improvements 2021-02-11 20:30:35 +03:00
Andrew Smirnov ac99a23a3b Small code style improvements 2021-02-11 20:15:46 +03:00
Andrew Smirnov c3f9e6626b Add extra_funcs to documentation 2021-02-11 20:04:08 +03:00
Andrew Smirnov 8024d38e09 Fix non-existing profile avatar 2021-02-11 19:44:35 +03:00
Andrew Smirnov 2919761b2f Fix README.md 2021-02-04 21:02:10 +03:00
Andrew Smirnov 5705afada1 Add issue templates 2021-02-04 20:59:55 +03:00
Andrew Smirnov 2e88fbae1c Add sphinx documentation initial template 2021-02-04 20:49:40 +03:00
Andrew Smirnov 9b52630cf4 Add OneToOne relation, fix image dir path 2021-02-04 20:41:11 +03:00
Andrew Smirnov 5e5bec6028 Fix profile model. Add OneToOne relation, fix image dir path 2021-02-04 20:40:56 +03:00
Andrew Smirnov 234669242f Add profile model, update requirements, readme and gitignore 2021-02-04 20:37:58 +03:00
Andrew Smirnov 6056a1e85b Initial commit. Add django. 2021-02-04 20:01:35 +03:00
Смирнов Андрей Александрович e37d472f5e Initial commit 2021-02-04 16:33:01 +00:00