Кравченко Артем
|
557de38505
|
Merge branch 'hotfix/control_permission' into 'develop'
Fix change permissions when role has changed
See merge request 2020-2021/online/s101/group-02/access_controller!91
|
2021-05-28 21:05:44 +00:00 |
|
Sokurov Idar
|
cad6b1c917
|
Fix change permissions when role has changed
|
2021-05-28 00:15:50 +03:00 |
|
Andrew Smirnov
|
9fcd1bb9f1
|
Merge branch 'develop' into feature/statistic/month_name_bug
|
2021-05-27 20:45:03 +03:00 |
|
Степаненко Ольга
|
a908fc4388
|
Add user docs
|
2021-05-27 15:24:56 +03:00 |
|
Степаненко Ольга
|
dc47c12efc
|
Fix problem in test for pylint
|
2021-05-23 21:05:06 +03:00 |
|
Степаненко Ольга
|
f56a2a82bb
|
Merge branch 'develop' into feature/documentation
# Conflicts:
# main/apiauth.py
# main/tests.py
# requirements/common.txt
# requirements/dev.txt
|
2021-05-23 11:51:41 +03:00 |
|
Andrew Smirnov
|
5748e3f842
|
Merge branch 'develop' into feature/statistic/month_name_bug
|
2021-05-20 19:43:39 +03:00 |
|
Степаненко Ольга
|
1114c916e9
|
Update docs (views, extra_func, forms, models)
|
2021-05-20 16:19:42 +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
|
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
|
c1329e6788
|
Merge branch 'develop' into feature/registration_failed/html
|
2021-05-13 19:57:44 +03:00 |
|
Kiselev Igor
|
5f88a4f297
|
Fixed statistic view date bug
|
2021-05-13 17:51:28 +03:00 |
|
Сокуров Идар
|
76cd782ff4
|
Add get tickets tests
|
2021-05-13 04:49:02 +00: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 |
|
Андреев Дмитрий
|
63949dd54e
|
Fix/header
|
2021-05-10 15:05:34 +00:00 |
|
|
|
be1bfdd259
|
Revert "Move main helper files to main/lib."
This reverts commit 6bc1c6d1089ceadd24bcd10a809816a51abb5068.
|
2021-05-06 08:47:15 -07:00 |
|
|
|
6bc1c6d108
|
Move main helper files to main/lib.
|
2021-05-06 08:45:15 -07:00 |
|
|
|
cc4c4ffdc2
|
Merge branch 'develop' into feature/profiling
|
2021-05-06 08:33:03 -07: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 |
|
Степаненко Ольга
|
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 |
|
Степаненко Ольга
|
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 |
|
|
|
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 |
|
Сокуров Идар
|
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 |
|
Andrew Smirnov
|
eea8e0aab8
|
Pylint improvements
|
2021-04-29 20:37:38 +03:00 |
|
Andrew Smirnov
|
bac3cf4dfd
|
Merge develop into feature/registration_failed/html
|
2021-04-29 20:03:04 +03:00 |
|
Степаненко Ольга
|
3155374185
|
Spell new docs
|
2021-04-28 21:17:41 +03:00 |
|
Степаненко Ольга
|
e5460d90fc
|
Use pylint for models.py
|
2021-04-28 16:18:55 +03: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 |
|
Степаненко Ольга
|
8e0610840d
|
Pylint 7.5
|
2021-04-27 19:41:47 +03:00 |
|
Степаненко Ольга
|
3f6cf23f4e
|
Add autopep8. First draft
|
2021-04-27 17:28:01 +03:00 |
|
Степаненко Ольга
|
015d5f65a7
|
Translate README.md to README.rst
|
2021-04-25 17:51:50 +03:00 |
|
Sokurov Idar
|
3019246935
|
Add custom ticket requests
|
2021-04-23 00:31:43 +03:00 |
|
|
|
974de20d5f
|
Merge branch 'develop' into feature/refactor
|
2021-04-20 15:45:58 -07:00 |
|
|
|
f65eb54652
|
Small views.py refactor
|
2021-04-20 15:39:55 -07:00 |
|
|
|
8d14f2e8b4
|
Fix some type hints, small ZendeskAdmin refactor
|
2021-04-20 15:19:02 -07:00 |
|
Сокуров Идар
|
30e4d93c81
|
Update views.py
|
2021-04-20 20:30:11 +00:00 |
|
|
|
750371e595
|
move ZendeskAdmin to separate file
|
2021-04-20 13:29:46 -07:00 |
|
Sokurov Idar
|
cff6443eca
|
Add notifications on work page, rebase already exists with notifications.js
|
2021-04-20 22:55:22 +03:00 |
|
