Commit Graph

Select branches

Hide Pull Requests

feature/drone-ci

master

Mono Color

• 2ea31e1594 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop Artyom Kravchenko 2021-04-06 18:04:22 +03:00
• 870cbca99c tmp commit Artyom Kravchenko 2021-04-06 18:04:13 +03:00
• 5001d1c71d Merge branch 'feature/statistic/main' into 'develop' Кравченко Артем 2021-04-06 14:35:38 +00:00
• 6f03526782 Merge branch 'feature/periodic_refactor' into 'develop' Кравченко Артем 2021-04-06 14:35:24 +00:00
• baf0c7560b Input new pictures v2 Степаненко Ольга 2021-04-06 14:07:08 +03:00
• 90f92d8314 Input new pictures Степаненко Ольга 2021-04-06 14:06:36 +03:00
• b3db81203f add daphne to requirements Artyom Kravchenko 2021-04-05 14:53:47 +03:00
• 30407e09dc Removed django context, now uses only React Yuriy Kulakov 2021-04-04 20:03:35 +03:00
• d3d75a27bf add initiall migr Artyom Kravchenko 2021-04-02 14:59:31 +03:00
• 575577642c Merge branch 'hotfix/fix_user_role_name' into 'develop' Кравченко Артем 2021-04-01 17:47:27 +00:00
• 3aaae33c44 Fix user role display. Migrate to displayable roles, defined in settings.ZENDESK_ROLES Andrew Smirnov 2021-04-01 20:46:07 +03:00
• 685fe35821 Merge branch 'feature/fix_work_page_css' into 'develop' CaZzzer 2021-04-01 17:06:29 +00:00
• 603ba30d59 #44 | fix work.css form-check-input CaZzzer 2021-04-01 10:03:21 -07:00
• 59882094bd Update README.md Кравченко Артем 2021-04-01 17:01:38 +00:00
• ef646a7b09 Deleted the testing leftovers Vadim Melnikov 2021-04-01 18:24:49 +03:00
• 94b5061301 Added button highlights depending on current page Vadim Melnikov 2021-04-01 18:12:13 +03:00
• ff8834f22d fixed migrations bug Artyom Kravchenko 2021-03-31 15:02:37 +03:00
• e377e64395 db bug Artyom Kravchenko 2021-03-31 12:23:55 +03:00
• 86e3bd3077 add db to dockerignore Artyom Kravchenko 2021-03-31 12:22:47 +03:00
• 7de09037c1 add env params Artyom Kravchenko 2021-03-31 10:54:16 +03:00
• d58c1c9fd8 db path fixed Artyom Kravchenko 2021-03-30 23:30:31 +03:00
• 4f106c4e17 merge dev Artyom Kravchenko 2021-03-30 17:32:35 +03:00
• 2de8a5473a add dockerignore Artyom Kravchenko 2021-03-30 17:28:52 +03:00
• 4f9f34ee40 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop Dmitriy Andreev 2021-03-30 12:57:29 +03:00
• 4dd48a5e4b Merge branch 'hotfix/role_view' into 'develop' Кравченко Артем 2021-03-29 21:58:39 +00:00
• 17328650c8 Fixed control page role changing Timofey Mazurov 2021-03-30 00:45:32 +03:00
• c7c019f70b Merge branch 'develop' into hotfix/role_view Timofey Mazurov 2021-03-30 00:39:28 +03:00
• 99979858f0 Deleted main page logging example Timofey Mazurov 2021-03-30 00:30:38 +03:00
• 3aa84cd04c Fixed role display on profile and admin pages Timofey Mazurov 2021-03-30 00:29:47 +03:00
• f47840f292 small refactoring Sokurov Idar 2021-03-29 22:37:18 +03:00
• 9e49a12524 Merge branch 'develop' into feature/statistic/main Sokurov Idar 2021-03-29 21:45:07 +03:00
• 6fd81c3ccc marge statistic/backend and statistic/frontend Sokurov Idar 2021-03-29 21:40:13 +03:00
• 697f21be45 fixed messages Artyom Kravchenko 2021-03-29 18:32:15 +03:00
• 7cef5c3a86 Merge branch 'feature/documentation' into 'develop' Кравченко Артем 2021-03-27 17:31:26 +00:00
• a4a797aa40 Make spelling Степаненко Ольга 2021-03-27 16:32:44 +03:00
• 4a0dfd2890 Add spelling version Степаненко Ольга 2021-03-27 14:12:44 +03:00
• 09a3e134ea Make users docs for rermission pages Степаненко Ольга 2021-03-27 11:50:22 +03:00
• f45a01fd12 Make user docs for main, registration and ligin pages Степаненко Ольга 2021-03-27 10:53:15 +03:00
• c097fc797e Add get tickets Andrey Kovalev 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 Степаненко Ольга 2021-03-23 14:10:27 +03:00
• 252f3e8144 Change views docs Степаненко Ольга 2021-03-23 13:53:00 +03:00
• e96ee7ac5b modified setings for starting db with docker volume Artyom Kravchenko 2021-03-22 17:08:17 +03:00
• acdca02916 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop Dmitriy Andreev 2021-03-22 13:18:59 +03:00
• e9e089d713 Merge branch 'feature/notifications' into 'develop' Кравченко Артем 2021-03-22 08:48:19 +00:00
• a8ca0b0eae Added notificcations about role changes Yuriy Kulakov 2021-03-21 19:47:42 +03:00
• d451ed15fe Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop Dmitriy Andreev 2021-03-20 21:49:49 +03:00
• 74823e6c26 Merge branch 'feature/licenses_remaining' into 'develop' Кравченко Артем 2021-03-20 12:24:33 +00:00
• 0c2e2d81bc #43 | Add max agents setting. Spots left count on /work/<id> and /control/ CaZzzer 2021-03-19 23:45:08 -07:00
• b50a6668a6 Merge branch 'develop' into feature/statistic/html Sokurov Idar 2021-03-18 22:59:40 +03:00
• 271695f6f6 fixed start.sh Artyom Kravchenko 2021-03-18 20:53:22 +03:00
• 7e2e6a7ab7 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop Artyom Kravchenko 2021-03-18 20:48:36 +03:00
• da46d019cb add TODO Artyom Kravchenko 2021-03-18 20:48:06 +03:00
• b4d91ecd06 Update README.md Кравченко Артем 2021-03-18 17:43:55 +00:00
• 95781c3ee9 Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop Dmitriy Andreev 2021-03-18 20:42:04 +03:00
• 1bb8e44d03 Merge branch 'hotfix/ticket_unassignment' into 'develop' Кравченко Артем 2021-03-18 17:21:04 +00:00
• 358351d6da optimize imports Sokurov Idar 2021-03-18 20:19:08 +03:00
• e563475ecd Merge branch 'develop' into hotfix/ticket_unassignment Sokurov Idar 2021-03-18 20:18:13 +03:00
• b5c3a12193 minor fix Sokurov Idar 2021-03-18 20:07:21 +03:00
• 2bb2c9556b fix ./manage.py migrate errors CaZzzer 2021-03-18 09:32:46 -07:00
• 3fc4cfa547 tmp commit docker fixed Artyom Kravchenko 2021-03-18 19:30:58 +03:00
• bca39c7a5f Added work v2 layout Vadim Melnikov 2021-03-18 18:48:58 +03:00
• 870ce45a63 Merge branch 'feature/periodic' into 'develop' Кравченко Артем 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 Степаненко Ольга 2021-03-18 09:59:18 +03:00
• 14cf635d3b Changed logs.csv location Timofey Mazurov 2021-03-17 16:16:09 +03:00
• 96a618f1b5 Merge branch 'develop' into feature/logging/func Timofey Mazurov 2021-03-17 16:02:04 +03:00
• 9d0b6982db Added logging for control page, fully added logging to project Timofey Mazurov 2021-03-17 16:01:39 +03:00
• 838d6926fc Fixed userprofile.custom_role_id updating issue in update_role, fixed userprofile.changed_by logging Timofey Mazurov 2021-03-17 16:00:55 +03:00
• 67da8681e5 Fixed userprofile.custom_role_id updating issue in work_hand_over and work_become_engineer Timofey Mazurov 2021-03-17 15:47:41 +03:00
• 5ec2407211 Add ticket unassignment Sokurov Idar 2021-03-17 09:35:15 +03:00
• 259ab76cba Added csv file logging Timofey Mazurov 2021-03-17 03:13:37 +03:00
• 0d0c9ad941 add dockerfile and script Artyom Kravchenko 2021-03-15 21:31:39 +03:00
• bee14a628c Merge branch 'feature/fixture/backend' into 'develop' Кравченко Артем 2021-03-15 18:27:56 +00:00
• 933ebb72d6 Updated database logging Timofey Mazurov 2021-03-15 21:03:11 +03:00
• 644f4de1e9 Merge remote-tracking branch 'origin/feature/logging/func' into feature/logging/func Timofey Mazurov 2021-03-15 19:38:25 +03:00
• da53c34e50 Added logging to database Timofey Mazurov 2021-03-14 21:27:26 +03:00
• 063c2bf17a Added default date to change_time field Timofey Mazurov 2021-03-14 20:34:46 +03:00
• 0a86853838 Removed logging settings Timofey Mazurov 2021-03-14 20:33:57 +03:00
• 46012f487b Merged develop into current Timofey Mazurov 2021-03-15 19:09:45 +03:00
• 18ff4a529f Added statistic.html Kiselev Igor 2021-03-15 05:20:39 +03:00
• 95c52f9302 Added and modified statistic.html Kiselev Igor 2021-03-15 05:18:08 +03:00
• b8883cc857 Added logging to database Timofey Mazurov 2021-03-14 21:27:26 +03:00
• e193ae0f55 Added default date to change_time field Timofey Mazurov 2021-03-14 20:34:46 +03:00
• 6f3356ad25 Removed logging settings Timofey Mazurov 2021-03-14 20:33:57 +03:00
• e75e93287e Added fixture with base users Yuriy Kulakov 2021-03-14 17:54:55 +03:00
• 0cc788c039 minor fix Sokurov Idar 2021-03-14 17:26:41 +03:00
• a430ee871d Add ticket unassignment(exclude solved tickets) Sokurov Idar 2021-03-14 17:13:41 +03:00
• 4f240e19f6 Add spelling settings and install tox but spelling is not still working Степаненко Ольга 2021-03-14 16:30:14 +03:00
• 79b7418b61 Add enchant without correct working Степаненко Ольга 2021-03-14 15:41:58 +03:00
• 1cd8874e03 Merge branch 'develop' into hotfix/ticket_unassignment Sokurov Idar 2021-03-14 13:12:59 +03:00
• c9ae302103 Add documentation to new forms, and first part of extra_func Степаненко Ольга 2021-03-14 12:42:18 +03:00
• be6005c4be Correct view documentation using typehints Степаненко Ольга 2021-03-13 16:41:28 +03:00
• d50a88e8bc Add params to extra_func Степаненко Ольга 2021-03-12 18:38:03 +03:00
• a434a4a30b Merge feature/periodic into develop Yuriy Kulakov 2021-03-12 15:39:54 +03:00
• d300cc2f06 Merge branch 'develop' into feature/periodic Yuriy Kulakov 2021-03-12 15:37:50 +03:00
• c1a10b6f2c Fixed bug with disappearance of table rows in control page at start Yuriy Kulakov 2021-03-12 14:54:57 +03:00