CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
321 Commits 2 Branches 0 Tags
db9676358adde174ab1c15430942d06c5d960ac3
Commit Graph
232 Commits
Author SHA1 Message Date
Кравченко Артем 5001d1c71d Merge branch 'feature/statistic/main' into 'develop' 
Feature/statistic/main

See merge request 2020-2021/online/s101/group-02/access_controller!42
 2021-04-06 14:35:38 +00:00
Yuriy Kulakov 30407e09dc Removed django context, now uses only React 2021-04-04 20:03:35 +03:00
Artyom Kravchenko d3d75a27bf add initiall migr 2021-04-02 14:59:31 +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
Vadim Melnikov 94b5061301 Added button highlights depending on current page 2021-04-01 18:12: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
Timofey Mazurov 17328650c8 Fixed control page role changing 2021-03-30 00:45:32 +03:00
Timofey Mazurov c7c019f70b Merge branch 'develop' into hotfix/role_view 
# Conflicts:
#	main/views.py
 2021-03-30 00:39:28 +03:00
Timofey Mazurov 99979858f0 Deleted main page logging example 2021-03-30 00:30:38 +03:00
Timofey Mazurov 3aa84cd04c Fixed role display on profile and admin pages 2021-03-30 00:29:47 +03:00
Sokurov Idar f47840f292 small refactoring 2021-03-29 22:37:18 +03:00
Sokurov Idar 9e49a12524 Merge branch 'develop' into feature/statistic/main 
# Conflicts:
#	main/models.py
#	main/views.py
 2021-03-29 21:45:07 +03:00
Sokurov Idar 6fd81c3ccc marge statistic/backend and statistic/frontend 2021-03-29 21:40:13 +03:00
Artyom Kravchenko 697f21be45 fixed messages 2021-03-29 18:32:15 +03:00
Степаненко Ольга a4a797aa40 Make spelling 2021-03-27 16:32:44 +03:00
Andrey Kovalev c097fc797e Add get tickets 2021-03-25 21:16:19 +03:00
Степаненко Ольга 0413a2edaf Add apiauth and serializers docs 2021-03-23 20:55:30 +03:00
Степаненко Ольга 2ce272d206 Add models docs after pulling 2021-03-23 20:22:42 +03:00
Степаненко Ольга b483998686 Add views docs after pulling 2021-03-23 15:27:52 +03:00
Степаненко Ольга 6c19ebdd3e Add extra_func docs after pulling 2021-03-23 15:05:16 +03:00
Степаненко Ольга ae9f41fd23 Merge branch 'develop' into feature/documentation 
# Conflicts:
#	main/extra_func.py
#	main/models.py
#	main/views.py
 2021-03-23 14:10:27 +03:00
Степаненко Ольга 252f3e8144 Change views docs 2021-03-23 13:53:00 +03:00
Artyom Kravchenko e96ee7ac5b modified setings for starting db with docker volume 2021-03-22 17:08:17 +03:00
Yuriy Kulakov a8ca0b0eae Added notificcations about role changes 2021-03-21 19:47:42 +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 b50a6668a6 Merge branch 'develop' into feature/statistic/html 2021-03-18 22:59:40 +03:00
Artyom Kravchenko da46d019cb add TODO 2021-03-18 20:48:06 +03:00
Sokurov Idar 358351d6da optimize imports 2021-03-18 20:19:08 +03: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 b5c3a12193 minor fix 2021-03-18 20:07:21 +03:00
CaZzzer 2bb2c9556b fix ./manage.py migrate errors 2021-03-18 09:32:46 -07:00
Кравченко Артем 870ce45a63 Merge branch 'feature/periodic' into 'develop' 
Feature/periodic into develop

See merge request 2020-2021/online/s101/group-02/access_controller!33
 2021-03-18 14:24:19 +00:00
Степаненко Ольга 0a7b4fb1a7 Temporary vertion with non-working enchant 2021-03-18 17:03:30 +03:00
Степаненко Ольга 10e341fcbb Merge branch 'develop' into feature/documentation 
# Conflicts:
#	main/templates/registration/login.html
 2021-03-18 09:59:18 +03:00
Timofey Mazurov 14cf635d3b Changed logs.csv location 2021-03-17 16:16:09 +03:00
Timofey Mazurov 96a618f1b5 Merge branch 'develop' into feature/logging/func 2021-03-17 16:02:04 +03:00
Timofey Mazurov 9d0b6982db Added logging for control page, fully added logging to project 2021-03-17 16:01:39 +03:00
Timofey Mazurov 838d6926fc Fixed userprofile.custom_role_id updating issue in update_role, fixed userprofile.changed_by logging 2021-03-17 16:00:55 +03:00
Timofey Mazurov 67da8681e5 Fixed userprofile.custom_role_id updating issue in work_hand_over and work_become_engineer 2021-03-17 15:47:41 +03:00
Sokurov Idar 5ec2407211 Add ticket unassignment 2021-03-17 09:35:15 +03:00
Timofey Mazurov 259ab76cba Added csv file logging 2021-03-17 03:13:37 +03:00
Timofey Mazurov 933ebb72d6 Updated database logging 2021-03-15 21:03:11 +03:00
Timofey Mazurov 644f4de1e9 Merge remote-tracking branch 'origin/feature/logging/func' into feature/logging/func 2021-03-15 19:38:25 +03:00
Timofey Mazurov da53c34e50 Added logging to database 2021-03-15 19:38:09 +03:00
Timofey Mazurov 063c2bf17a Added default date to change_time field 2021-03-15 19:35:45 +03:00
Timofey Mazurov 46012f487b Merged develop into current 2021-03-15 19:09:45 +03:00
Kiselev Igor 18ff4a529f Added statistic.html 2021-03-15 05:20:39 +03:00