Andrew Smirnov
|
ee2959e16a
|
Merge branch 'develop' into feature/react_test
# Conflicts:
# main/tests.py
|
2021-05-20 20:23:27 +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 |
|
Yuriy Kulakov
|
3bc9f554db
|
Upgraded readme and removed unused files
|
2021-05-16 20:47:23 +03:00 |
|
Yuriy Kulakov
|
fe1f22efbd
|
Merge branch 'develop' into feature/react_test
|
2021-05-16 20:44:11 +03:00 |
|
Yuriy Kulakov
|
2f15d74a56
|
Added more tests
|
2021-05-16 20:43:13 +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 |
|
Yuriy Kulakov
|
c047e37577
|
Updated .gitignore
|
2021-05-13 20:31:17 +03:00 |
|
Yuriy Kulakov
|
a2620323f4
|
Upgraded README.md
|
2021-05-13 20:26:13 +03:00 |
|
Andrew Smirnov
|
edd32094c0
|
Remov django-node-assets from settings, add sudo request in npm install -g npx
|
2021-05-13 20:10:38 +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
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
Yuriy Kulakov
|
e32f12019e
|
Added control page tests and fixed bugs
|
2021-05-07 22:29:50 +03: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 |
|
Yuriy Kulakov
|
fe33c8d042
|
Added some tests for control page
|
2021-05-06 12:30:14 +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 |
|
|
|
824077fbd9
|
Merge branch 'feature/register_tests' into 'develop'
#72 | Add registration tests
See merge request 2020-2021/online/s101/group-02/access_controller!64
|
2021-05-05 23:44:24 +00: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 |
|
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 |
|
