CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
356 Commits 2 Branches 0 Tags
8b70827f07d7f505c251ff962acfa25d28cc1bba
Commit Graph
57 Commits
Author SHA1 Message Date
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
Сокуров ИдарandCaZzzer 0086d4909e Feature/tests/make_eng from work and control pages 2021-05-06 15:22:57 +00:00
Сокуров ИдарandCaZzzer 66339c4f6b Add registration tests 2021-05-05 23:44:24 +00: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 3b9ae4f2fa Added django_node_assets 2021-04-27 20:24:58 +03:00
Sokurov Idar 5c3801c317 Add password change page 2021-04-26 21:47:45 +03:00
Artyom Kravchenko f4d4cffa9f tmp commit 2021-04-19 17:52:10 +03:00
CaZzzer cc08c0171b Merge branch 'develop' into feature/docker 2021-04-15 09:40:00 -07:00
CaZzzer 508324c62c Move email, secrets, run params to env. Update README.md 2021-04-09 01:34:19 -07:00
Artyom Kravchenko 0e6f016d1e Merge branch 'develop' into feature/docker 2021-04-08 15:45:43 +03:00
Artyom Kravchenko 19fc23808c test nginx 2021-04-08 15:39:47 +03:00
Artyom Kravchenko 870cbca99c tmp commit 2021-04-06 18:04:13 +03:00
Artyom Kravchenko ff8834f22d fixed migrations bug 2021-03-31 15:02:37 +03:00
Artyom Kravchenko 7de09037c1 add env params 2021-03-31 10:54:16 +03:00
Artyom Kravchenko d58c1c9fd8 db path fixed 2021-03-30 23:30:31 +03:00
Artyom Kravchenko 4f106c4e17 merge dev 2021-03-30 17:32:35 +03:00
Artyom Kravchenko e96ee7ac5b modified setings for starting db with docker volume 2021-03-22 17:08:17 +03:00
CaZzzer 0c2e2d81bc #43 | Add max agents setting. Spots left count on /work/<id> and /control/ 2021-03-19 23:45:08 -07:00
Sokurov Idar e563475ecd Merge branch 'develop' into hotfix/ticket_unassignment 
# Conflicts:
#	access_controller/settings.py
#	main/extra_func.py
#	main/views.py
 2021-03-18 20:18:13 +03:00
Sokurov Idar 5ec2407211 Add ticket unassignment 2021-03-17 09:35:15 +03:00
Sokurov Idar a430ee871d Add ticket unassignment(exclude solved tickets) 2021-03-14 17:13:41 +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
Sokurov Idar 60e1da2825 12-hour working day 2021-03-11 19:17:11 +03:00
Yuriy Kulakov 8488ea88c2 Added Django REST but have some bugs 2021-03-07 21:30:02 +03:00
Sokurov Idar 4a604f0941 Merge branch 'develop' into feature/statistic/backend 
# Conflicts:
#	access_controller/urls.py
#	main/forms.py
#	main/views.py
 2021-03-04 23:16:21 +03:00
Кулаков Юрий 9ddf1db2a3 Fixed bug with permissions 2021-03-04 20:45:55 +03:00
Sokurov Idar fd1e048ebe statistic backend first version 2021-03-04 01:25:56 +03:00
Sokurov Idar 4299b1ed37 Merge branch 'develop' into feature/registration 
# Conflicts:
#	access_controller/urls.py
#	main/extra_func.py
#	main/forms.py
#	main/views.py
 2021-03-02 21:53:43 +03:00
Sokurov Idar f50ce49d77 update login with email 2021-03-02 21:44:13 +03:00
Andrey Kovalev 09a423060c Merge 'develop' into 'feature/work/backend' 2021-03-02 20:19:42 +03:00
Yuriy Kulakov 918306aa48 Merge branch 'develop' into feature/adm_ruleset/backend 
# Conflicts:
#	access_controller/settings.py
#	access_controller/urls.py
#	main/forms.py
#	main/views.py
 2021-02-25 18:41:08 +03:00
Artyom Kravchenko 61ea10f1d2 test role change 2021-02-25 18:24:14 +03:00
Тонковид Роман c71949dac6 Кнопка восстановления пароля привязана к странице 2021-02-25 16:13:49 +03:00
Artyom Kravchenko b0932c94b6 merge registration branch 2021-02-25 14:17:36 +03:00
Yuriy Kulakov baf02cca44 Added user list function 2021-02-23 19:46:43 +03:00
Yuriy Kulakov 034c3eed70 Added admin control page 2021-02-21 21:35:36 +03:00
Sokurov Idar 8b512afadb fix bug, update registration 2021-02-19 17:55:27 +03:00
Sokurov Idar 0953a0627e Temporary 2021-02-18 20:58:10 +03:00
Andrew Smirnov ca1fab09c9 Add logging framework usage example 2021-02-18 20:45:56 +03:00
Sokurov Idar b777d47041 Recreate registration v1 2021-02-18 19:22:10 +03:00
Andrey Kovalev bf69c870cd Add rights management backend 2021-02-17 20:43:57 +03:00
Sokurov Idar d91f5b8ba8 Add media to staticfiles, update profile.html 2021-02-11 21:26:02 +03:00
Andrew Smirnov 8c9b5a9cfa Fix urls, update menu, codestyle improvements, add views in documentation 2021-02-11 20:58:07 +03:00
Кравченко Артем ef36e8de40 Merge branch 'feature/base/html' into 'develop' 
A few changes design of menu

See merge request 2020-2021/online/s101/group-02/access_controller!5
 2021-02-11 17:28:55 +00:00
Andrew Smirnov ac99a23a3b Small code style improvements 2021-02-11 20:15:46 +03:00
Artyom Kravchenko 7a5c7faf91 resolve merge conflicts 2021-02-11 01:55:28 +03:00
Dmitriy Andreev 298baa3198 Added site logo 2021-02-10 21:18:38 +03:00
Кулаков Юрий d4d7fe49f2 Merge branch 'feature/base/html' into feature/authorization 
# Conflicts:
#	access_controller/urls.py
 2021-02-09 23:32:33 +03:00
Sokurov Idar 729c0bec7e Email on zendesk exist check 2021-02-08 20:12:24 +03:00
Sokurov Idar 16fd0e3983 Merge remote-tracking branch 'origin/feature/profile_page' into feature/registration 
# Conflicts:
#	access_controller/urls.py
#	main/views.py
 2021-02-08 19:12:51 +03:00