CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
548 Commits 2 Branches 0 Tags
080e04c520ecc6174e0bbe0104691bd4d32103db
Commit Graph
59 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuriy Kulakov e5e6541ac8 Merge branch 'develop' into feature/react_test 2021-05-28 13:56:11 +03:00
Yuriy Kulakov 07057c8667 Merge branch 'feature/react_test' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into feature/react_test 
# Conflicts:
#	README.rst
 2021-05-27 21:21:36 +03:00
Yuriy Kulakov cdffaed91c Updated README.rst 2021-05-27 21:19:37 +03:00
Yuriy Kulakov 49174804b4 Merge branch 'develop' into feature/react_test 2021-05-27 20:06:22 +03:00
Yuriy Kulakov 55cba3b036 Updated design of control page 2021-05-27 20:00:28 +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
Yuriy Kulakov f803b35f4e Added documentation for ControlAccessTests class 2021-05-25 20:35:53 +03:00
Yuriy Kulakov 09938ec2fd Updated .gitignore 2021-05-25 20:04:39 +03:00
Yuriy Kulakov 3cdc944ce4 Merge branch 'develop' into feature/react_test 
# Conflicts:
#	README.md
#	main/tests.py
 2021-05-25 19:55:07 +03:00
Yuriy Kulakov be6a8d1196 Removed js modules files from static 2021-05-21 20:52:22 +03: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
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 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
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
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
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
Yuriy Kulakov af63ee29f3 Now the first column of table at control page is checkbox 2021-04-18 19:15:23 +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
Yuriy Kulakov a8ca0b0eae Added notificcations about role changes 2021-03-21 19:47:42 +03:00
Yuriy Kulakov e75e93287e Added fixture with base users 2021-03-14 17:54:55 +03:00
Yuriy Kulakov a434a4a30b Merge feature/periodic into develop 2021-03-12 15:39:54 +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
Yuriy Kulakov abe44fec5f Refactored some functions in AdminPageView 2021-03-12 13:01:41 +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
Кулаков Юрий fa3716c2df Merge branch 'develop' into feature/adm_ruleset/backend 2021-03-04 20:46:25 +03:00
Кулаков Юрий 9ddf1db2a3 Fixed bug with permissions 2021-03-04 20:45:55 +03:00
Yuriy Kulakov 525bb25697 Merge branch 'develop' into feature/adm_ruleset/backend 2021-03-04 19:06:45 +03:00
Yuriy Kulakov 1fac1b4835 Merge branch 'develop' into feature/adm_ruleset/backend 
# Conflicts:
#	main/views.py
 2021-03-04 18:32:08 +03:00
Yuriy Kulakov d46b90010d Added permissions system to control page 2021-03-04 18:22:49 +03:00
Кулаков Юрий 8df2b66b7a Added engineers and light_agents count from organization to control page 2021-02-25 21:57:04 +03:00
Кулаков Юрий a12476ff70 changed function name 2021-02-25 20:41:05 +03:00
Кулаков Юрий 62b4b912e8 changed function name 2021-02-25 20:38:29 +03:00
Yuriy Kulakov 8ac6b10af2 merged with develop 2021-02-25 19:31:26 +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
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
Кулаков Юрий 7e8bcb96e7 Added a model for logging user role changes 2021-02-17 20:30:57 +03:00
Кулаков Юрий 4326d12b5c Login template now extends base/base.html 2021-02-09 23:42:23 +03:00
Кулаков Юрий d4d7fe49f2 Merge branch 'feature/base/html' into feature/authorization 
# Conflicts:
#	access_controller/urls.py
 2021-02-09 23:32:33 +03:00
Кулаков Юрий d1dcb9b1bf Added additional LoginView in the urls.py to define extra_context later 2021-02-07 20:28:15 +03:00
Кулаков Юрий f6193a837a Added authorization page 2021-02-07 20:17:27 +03:00