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 |
|
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 |
|
|
|
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 |
|
Yuriy Kulakov
|
f4e5b9192e
|
Changed scripts' sources at control ppage
|
2021-04-30 20:55:42 +03:00 |
|
Yuriy Kulakov
|
c61fbaa2e7
|
Added js imports
|
2021-04-29 21:18:27 +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 |
|
Смирнов Андрей Александрович
|
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 |
|
Yuriy Kulakov
|
82fde03db9
|
Merge branch 'develop' into feature/react_test
# Conflicts:
# static/main/js/control_page/control.js
|
2021-04-29 16:52:31 +03:00 |
|
Yuriy Kulakov
|
760d28a768
|
Update package.json
|
2021-04-29 16:33:41 +03:00 |
|
Кравченко Артем
|
96e5865d3b
|
Merge branch 'feature/change_pswd_btn' into 'develop'
Исправлены уведомления, добавлена страница смены пароля
See merge request 2020-2021/online/s101/group-02/access_controller!65
|
2021-04-28 11:24:18 +00:00 |
|
Кравченко Артем
|
97ec66da2c
|
Merge branch 'feature/table_design' into 'develop'
Changed styles of inactive users in table
See merge request 2020-2021/online/s101/group-02/access_controller!63
|
2021-04-28 11:23:47 +00:00 |
|
Yuriy Kulakov
|
0b73f4163e
|
Merge branch 'develop' into feature/react_test
|
2021-04-27 22:07:57 +03:00 |
|
Yuriy Kulakov
|
3b9ae4f2fa
|
Added django_node_assets
|
2021-04-27 20:24:58 +03:00 |
|
|
|
006858e63f
|
Update README.md
|
2021-04-27 16:05:21 +00:00 |
|
Sokurov Idar
|
43668f9ecf
|
tmp commit
|
2021-04-26 22:02:20 +03:00 |
|
Sokurov Idar
|
b2e7c84913
|
change notifications duration
|
2021-04-26 22:00:38 +03:00 |
|
Sokurov Idar
|
18c76f1340
|
Fix .gitignore, add required files
|
2021-04-26 21:54:15 +03:00 |
|
Sokurov Idar
|
5c3801c317
|
Add password change page
|
2021-04-26 21:47:45 +03:00 |
|
Yuriy Kulakov
|
7e3b2a918e
|
Merge branch 'develop' into feature/test_table_design
|
2021-04-25 20:34:44 +03:00 |
|
