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 |
|
Кравченко Артем
|
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 |
|
|
|
de0da89f0a
|
Add coverage, set up CI.
|
2021-05-19 23:58:30 -07:00 |
|
|
|
c95c0fe00b
|
Delete unused main/apiauth.py
|
2021-05-19 21:46:30 -07:00 |
|
|
|
5d8810062c
|
Merge branch 'feature/tests/logs' into 'develop'
Issue #75
See merge request 2020-2021/online/s101/group-02/access_controller!82
|
2021-05-19 22:57:37 +00:00 |
|
Мазуров Тимофей
|
e0ca38cd6d
|
Issue #75
|
2021-05-19 22:57:37 +00:00 |
|
|
|
bcbfd987b4
|
Merge branch 'feature/tests/make_la' into 'develop'
#71 | Тесты Получения Прав Легкого Агента
See merge request 2020-2021/online/s101/group-02/access_controller!83
|
2021-05-19 22:16:59 +00:00 |
|
|
|
0a9f57155c
|
#71 | Тесты Получения Прав Легкого Агента
|
2021-05-19 22:16:58 +00:00 |
|
|
|
cb3d244f90
|
Update requirements
|
2021-05-19 11:37:33 -07:00 |
|
Степаненко Ольга
|
0b144dd881
|
Move django-settings for pylint to pylintrc
|
2021-05-16 11:01:10 +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
|
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 |
|
|
|
d4e6458574
|
Merge branch 'feature/dotenv' into 'develop'
Add `python-dotenv`
See merge request 2020-2021/online/s101/group-02/access_controller!78
|
2021-05-13 17:04:56 +00:00 |
|
|
|
86995e01b3
|
Add python-dotenv
|
2021-05-13 17:04:56 +00: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 |
|
|
|
796ffb0898
|
Merge branch 'feature/tests/profile' into 'develop'
#77 | Add profile tests
See merge request 2020-2021/online/s101/group-02/access_controller!77
|
2021-05-13 04:57:51 +00:00 |
|
Сокуров Идар
|
74f8b1ce1f
|
Add profile tests
|
2021-05-13 04:57:51 +00:00 |
|
|
|
082c804dbd
|
Merge branch 'feature/tests/get_tickets' into 'develop'
#76 | Add get tickets tests
See merge request 2020-2021/online/s101/group-02/access_controller!76
|
2021-05-13 04:49:02 +00:00 |
|
Сокуров Идар
|
76cd782ff4
|
Add get tickets tests
|
2021-05-13 04:49:02 +00:00 |
|
Степаненко Ольга
|
a6ceae8240
|
Pylint 10
|
2021-05-12 20:34:52 +03:00 |
|
|
|
16feae1bf1
|
Merge branch 'feature/tests/reset_pass' into 'develop'
Add reset password tests
See merge request 2020-2021/online/s101/group-02/access_controller!74
|
2021-05-11 05:56:40 +00:00 |
|
Сокуров Идар
|
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 |
|
|
|
956a024ba2
|
Fix data.json
|
2021-05-10 08:14:41 -07:00 |
|
|
|
b9d937f3fc
|
Merge branch 'fix/header' into 'develop'
Fix/header
See merge request 2020-2021/online/s101/group-02/access_controller!73
|
2021-05-10 15:05:34 +00:00 |
|
Андреев Дмитрий
|
63949dd54e
|
Fix/header
|
2021-05-10 15:05:34 +00:00 |
|
|
|
e886004069
|
Remove unnecessary files.
|
2021-05-06 09:07:21 -07:00 |
|
|
|
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 |
|
