CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
542 Commits 2 Branches 0 Tags
Commit Graph

44 Commits

Author SHA1 Message Date
Кравченко Артем
8a6df6ac1f Merge branch 'feature/favicon' into 'develop' 
Feature/favicon

See merge request 2020-2021/online/s101/group-02/access_controller!96
 2021-05-29 14:25:29 +00:00
Kiselev Igor
d3939fa1ec Added favicon 2021-05-28 17:47:49 +03:00
Yuriy Kulakov
df06c8f807 Deleted unused files 2021-05-27 19:37:08 +03:00
Yuriy Kulakov
0a85ddacd2 Merge branch 'develop' into feature/react_test 
# Conflicts:
#	access_controller/settings.py
#	main/templates/pages/adm_ruleset.html
#	static/main/js/control.js
 2021-05-27 19:35:59 +03:00
Dmitriy Andreev
72030040b8 Fix looking of profile, work and control pages 2021-05-26 17:05:48 +03:00
Yuriy Kulakov
be6a8d1196 Removed js modules files from static 2021-05-21 20:52:22 +03:00
Yuriy Kulakov
2f15d74a56 Added more tests 2021-05-16 20:43:13 +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
Yuriy Kulakov
e32f12019e Added control page tests and fixed bugs 2021-05-07 22:29:50 +03:00
Yuriy Kulakov
fe33c8d042 Added some tests for control page 2021-05-06 12:30:14 +03:00
Yuriy Kulakov
79fb2412d6 Added webpack for js 2021-05-04 18:19:30 +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
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
Yuriy Kulakov
3b9ae4f2fa Added django_node_assets 2021-04-27 20:24:58 +03:00
Sokurov Idar
18c76f1340 Fix .gitignore, add required files 2021-04-26 21:54:15 +03:00
Yuriy Kulakov
7e3b2a918e Merge branch 'develop' into feature/test_table_design 2021-04-25 20:34:44 +03:00
Yuriy Kulakov
a0c3a41360 Changed styles of inactive users in table 2021-04-25 20:22:19 +03:00
Yuriy Kulakov
746a2c2543 small fixes 2021-04-25 20:17:02 +03:00
Yuriy Kulakov
5bd37d2203 Added first templates of react tests 2021-04-25 19:58:56 +03:00
Sokurov Idar
cff6443eca Add notifications on work page, rebase already exists with notifications.js 2021-04-20 22:55:22 +03:00
Yuriy Kulakov
af63ee29f3 Now the first column of table at control page is checkbox 2021-04-18 19:15:23 +03:00
Artyom Kravchenko
afec8e59e4 merge take tickets 2021-04-15 18:47:58 +03:00
Yuriy Kulakov
fea4575562 Control page displays all users from zendesk and db 2021-04-11 17:35:42 +03:00
Yuriy Kulakov
30407e09dc Removed django context, now uses only React 2021-04-04 20:03:35 +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
Iurii Tatishchev
603ba30d59
#44 | fix work.css form-check-input 2021-04-01 10:03:21 -07:00
Andrey Kovalev
c097fc797e Add get tickets 2021-03-25 21:16:19 +03:00
Yuriy Kulakov
a8ca0b0eae Added notificcations about role changes 2021-03-21 19:47:42 +03:00
Yuriy Kulakov
d300cc2f06 Merge branch 'develop' into feature/periodic 
# Conflicts:
#	access_controller/settings.py
#	access_controller/urls.py
#	main/extra_func.py
#	main/views.py
 2021-03-12 15:37:50 +03:00
Yuriy Kulakov
c1a10b6f2c Fixed bug with disappearance of table rows in control page at start 2021-03-12 14:54:57 +03:00
Artyom Kravchenko
f6948d016d add some design to menu template(logo and color) 2021-03-12 14:39:51 +03:00
Yuriy Kulakov
72b70cc585 Fixed bug with api response 2021-03-11 19:29:16 +03:00
Yuriy Kulakov
8488ea88c2 Added Django REST but have some bugs 2021-03-07 21:30:02 +03:00
Yuriy Kulakov
d46b90010d Added permissions system to control page 2021-03-04 18:22:49 +03:00
Ivan Pesnya
d19cfd103d done! 2021-02-18 20:51:34 +03:00
Ivan Pesnya
905a9167f5 Merge branch 'develop' into feature/work/html 2021-02-17 15:50:10 +03:00
=
7d240651f6 mvp ready 2021-02-17 15:47:45 +03:00
Andrew Smirnov
7e779733c2
Mode imgs from staticfiles to static folder 2021-02-11 21:04:24 +03:00
Andrew Smirnov
8024d38e09
Fix non-existing profile avatar 2021-02-11 19:44:35 +03:00
Andrew Smirnov
6056a1e85b
Initial commit. Add django. 2021-02-04 20:01:35 +03:00