Commit Graph

Select branches

Hide Pull Requests

bugfix/dashboard

bugfix/minor-issues-2

bugfix/zoomchangeAndOneShot

develop

enhancement/customFields

enhancement/dashboardFeedback

enhancement/dynamiccameraFeed

enhancement/regionSelector

enhancement/responsive

enhancement/statusIndicators

enhancement/systemHealth

enhancement/videoFeed

feature/baywatchPage

feature/blackboard

feature/brushsize

feature/cameraControls

feature/cameraControls-2

feature/cameras-2

feature/dashboardPage

feature/digitalZoom

feature/includeoption

feature/osdOverlayOptions

feature/output-2

feature/outputPage

feature/resetAll

feature/settingsPage

feature/targetdetection

feature/ws-Camera

main

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#4

#5

#6

#7

#8

#9

Mono Color

• a6235a6844 Merge pull request 'develop' (#29) from develop into main main TobaOjo 2026-01-13 16:11:33 +00:00
• 9520aa5dac Merge branch 'main' into develop #29 develop TobaOjo 2026-01-13 16:11:22 +00:00
• 00ca9441b9 Merge pull request 'Implemented brush size feature in camera feed settings' (#32) from feature/brushsize into develop TobaOjo 2026-01-13 16:10:32 +00:00
• 1243ce2098 Implemented brush size feature in camera feed settings #32 feature/brushsize Toba Ojo 2026-01-13 16:10:05 +00:00
• 845d603ae3 Merge pull request 'develop' (#28) from develop into main TobaOjo 2026-01-12 15:13:42 +00:00
• 1653d9f0d4 Merge pull request 'bugfix/zoomchangeAndOneShot' (#31) from bugfix/zoomchangeAndOneShot into develop #28 TobaOjo 2026-01-12 15:13:14 +00:00
• eb5eb69c28 - added zoom options per camera and oneshot button #31 bugfix/zoomchangeAndOneShot Toba Ojo 2026-01-12 15:10:40 +00:00
• 61c85fdc3f updated version Toba Ojo 2025-12-23 15:00:09 +00:00
• 7877173f56 Add corner radius to video feed layer for improved aesthetics Toba Ojo 2025-12-23 14:58:27 +00:00
• eb3f441a24 Merge pull request 'develop' (#30) from develop into main TobaOjo 2025-12-19 11:12:12 +00:00
• bf77d6001a Merge pull request 'bugfix/minor-issues-2' (#27) from bugfix/minor-issues-2 into develop #30 TobaOjo 2025-12-19 11:10:54 +00:00
• 0bdc8b25a8 - updated version #27 bugfix/minor-issues-2 Toba Ojo 2025-12-19 11:09:58 +00:00
• dfc14575a8 - removed console.logs Toba Ojo 2025-12-19 09:42:07 +00:00
• b328d25bc7 Add OSD and Payload configuration components with toggle functionality Toba Ojo 2025-12-18 13:38:27 +00:00
• b79da7048e Merge pull request 'enhancement/dynamiccameraFeed' (#26) from enhancement/dynamiccameraFeed into develop TobaOjo 2025-12-18 09:58:35 +00:00
• dab49fd99c Refactored routing components for better organization and maintainability #26 enhancement/dynamiccameraFeed Toba Ojo 2025-12-17 16:07:01 +00:00
• 775fce7900 Refactor camera feed handling to support dynamic camera IDs and improve context management Toba Ojo 2025-12-17 14:19:23 +00:00
• cc8b3a5691 Merge pull request 'more accurate system status' (#25) from bugfix/dashboard into develop TobaOjo 2025-12-17 09:46:26 +00:00
• 71ce2a9f91 - removed console.log - fixed issue for more extensive check into tags to be more accurate #25 bugfix/dashboard Toba Ojo 2025-12-17 09:44:14 +00:00
• 3fbafbbcc7 - minor bugfixes - added developer modal for viewing app data Toba Ojo 2025-12-12 12:18:17 +00:00
• b38fbe132b Merge pull request 'develop' (#24) from develop into main TobaOjo 2025-12-12 08:33:36 +00:00
• 9489fe2d6a Merge branch 'main' into develop #24 TobaOjo 2025-12-12 08:33:27 +00:00
• 3353ad6f8b - updated paths and code splitting config Toba Ojo 2025-12-12 08:32:06 +00:00
• d1995f0a9f - updated main endpoint end point and added flexibility for camera navigation Toba Ojo 2025-12-11 10:52:13 +00:00
• e395777ae9 - added modal for entry and exit sightings and plate patches Toba Ojo 2025-12-10 22:32:30 +00:00
• ba93753df7 Merge pull request 'feature/ws-Camera' (#23) from feature/ws-Camera into develop TobaOjo 2025-12-10 14:09:24 +00:00
• eb45eabde9 - improved magnification level text - removed magnification level #23 feature/ws-Camera Toba Ojo 2025-12-10 14:08:44 +00:00
• 10e2644666 - improved zoom while clicking on on image to zoom Toba Ojo 2025-12-10 13:09:07 +00:00
• 0ff43d975d - added digital zoom functionality on fixed location via web sockets Toba Ojo 2025-12-10 10:30:32 +00:00
• f0f311f316 Merge pull request 'develop' (#22) from develop into main TobaOjo 2025-12-09 15:54:52 +00:00
• c73c5f4187 - adjusted button on settings #22 Toba Ojo 2025-12-09 15:53:20 +00:00
• 0378667fe3 Merge pull request '- Enhanced responsiveness and layout adjustments across various components' (#21) from enhancement/responsive into develop TobaOjo 2025-12-09 14:09:06 +00:00
• 632962aeaf - Enhanced responsiveness and layout adjustments across various components #21 enhancement/responsive Toba Ojo 2025-12-09 14:07:51 +00:00
• e6f4131c1e Merge pull request 'Add zoom mode functionality and refactor video feed hooks' (#20) from feature/digitalZoom into develop TobaOjo 2025-12-09 13:04:10 +00:00
• 06fe99b550 Merge branch 'develop' into feature/digitalZoom #20 feature/digitalZoom TobaOjo 2025-12-09 13:04:03 +00:00
• 328c61cf98 Merge pull request '- implement camera zoom controls and state management' (#19) from feature/cameraControls-2 into develop TobaOjo 2025-12-09 13:03:42 +00:00
• a9f6c4a4ad Merge branch 'develop' into feature/cameraControls-2 #19 feature/cameraControls-2 TobaOjo 2025-12-09 13:03:34 +00:00
• 59e09b7a8d Merge pull request '- need endpoint for include and exclude' (#18) from feature/includeoption into develop TobaOjo 2025-12-09 13:03:08 +00:00
• c6a336389b Add zoom mode functionality and refactor video feed hooks Toba Ojo 2025-12-09 12:39:03 +00:00
• b93b446614 - implement camera zoom controls and state management Toba Ojo 2025-12-09 08:47:21 +00:00
• a563a3c341 - need endpoint for include and exclude #18 feature/includeoption Toba Ojo 2025-12-08 12:50:14 +00:00
• fa33b012cc Merge pull request '- added reset all modal and integrate with camera settings' (#17) from feature/resetAll into develop TobaOjo 2025-12-08 11:50:14 +00:00
• eefa98f03a - added reset all modal and integrate with camera settings #17 feature/resetAll Toba Ojo 2025-12-08 11:49:12 +00:00
• 8b3bff8a45 Merge pull request '- added camera black board fetch and post' (#16) from feature/blackboard into develop TobaOjo 2025-12-08 11:03:47 +00:00
• 1628048ac5 - added camera black board fetch and post #16 feature/blackboard Toba Ojo 2025-12-08 10:59:46 +00:00
• 7cda7d5887 - general fixes across the app - minor fixes - code clean up and improvements Toba Ojo 2025-12-08 09:03:04 +00:00
• 4c53c04767 Merge pull request '- added OSD configuration components and hooks for managing overlay settings' (#15) from feature/osdOverlayOptions into develop TobaOjo 2025-12-06 21:17:24 +00:00
• 8a5a4f5c67 - added OSD configuration components and hooks for managing overlay settings #15 feature/osdOverlayOptions Toba Ojo 2025-12-06 21:16:11 +00:00
• f0587a2b43 - improved layouts across app - adjusted card spacing Toba Ojo 2025-12-05 17:01:57 +00:00
• 9e89193747 - finally fixed custom imput to match what is on backend on sighting amend endpoint Toba Ojo 2025-12-05 12:53:42 +00:00
• 9208470e53 - addressing feedback Toba Ojo 2025-12-04 19:14:14 +00:00
• 3af4e585e7 Merge pull request '- added formik custom fields to settings and output' (#14) from enhancement/customFields into develop TobaOjo 2025-12-04 09:55:18 +00:00
• 7f9923167e - added formik custom fields to settings and output #14 enhancement/customFields Toba Ojo 2025-12-03 19:51:02 +00:00
• 018203b203 Merge pull request '- improved statuses acress dashboard and child cards' (#13) from enhancement/statusIndicators into develop TobaOjo 2025-12-03 16:06:14 +00:00
• 173b1d0e51 - improved statuses acress dashboard and child cards #13 enhancement/statusIndicators Toba Ojo 2025-12-03 16:05:06 +00:00
• 9b35deaf12 Merge pull request '- Enhance layout and responsiveness of camera components' (#12) from enhancement/videoFeed into develop TobaOjo 2025-12-03 13:42:43 +00:00
• 59bcb3c45b - Enhance layout and responsiveness of camera components #12 enhancement/videoFeed Toba Ojo 2025-12-03 13:39:18 +00:00
• 10590e5658 Merge pull request 'enhancement/dashboardFeedback' (#11) from enhancement/dashboardFeedback into develop TobaOjo 2025-12-03 10:58:07 +00:00
• f7964d4fc0 - added download button - added reads for number plate sightings #11 enhancement/dashboardFeedback Toba Ojo 2025-12-03 10:46:36 +00:00
• 2a4afc7eae - organised file structure for dashboard Toba Ojo 2025-12-02 14:10:06 +00:00
• 1810fc04b5 Merge pull request 'feature/settingsPage' (#10) from feature/settingsPage into develop TobaOjo 2025-12-02 13:54:56 +00:00
• d9594546a0 Merge branch 'develop' into feature/settingsPage #10 feature/settingsPage TobaOjo 2025-12-02 13:54:47 +00:00
• dbadc7388c - added settings page - can post and get data from endpoint - moved toaster to main page - updated config for CORS Toba Ojo 2025-12-02 13:45:44 +00:00
• ce79591de0 - enhancedcamera settings and region painter. enhancement/regionSelector Toba Ojo 2025-12-01 14:36:25 +00:00
• 748be931ed Merge pull request 'enhancement/systemHealth' (#9) from enhancement/systemHealth into develop TobaOjo 2025-12-01 09:41:36 +00:00
• 6cb2e88b3b - added new dashboard items - added camera module statuses #9 enhancement/systemHealth Toba Ojo 2025-12-01 09:33:29 +00:00
• 4e02bafa6a - added status grid items - add react modal pkg Toba Ojo 2025-11-28 15:06:03 +00:00
• 983f307c3f Merge pull request 'Refactor camera feed components and add sighting tables' (#8) from feature/cameraControls into develop TobaOjo 2025-11-28 13:02:17 +00:00
• ddb1fa1bf1 Refactor camera feed components and add sighting tables #8 feature/cameraControls Toba Ojo 2025-11-28 12:58:42 +00:00
• c910a3dd50 Merge pull request 'feature/targetdetection' (#7) from feature/targetdetection into develop TobaOjo 2025-11-28 09:21:03 +00:00
• 690043e9f7 - updated ws endpoint #7 feature/targetdetection Toba Ojo 2025-11-28 09:18:46 +00:00
• 6428a8fa39 - added tabs for camera controls Toba Ojo 2025-11-28 09:00:55 +00:00
• bf31f94b32 - Enhanced camera feed state management with region handling and mode changes Toba Ojo 2025-11-27 16:16:15 +00:00
• f7dbde4511 - implemented isolated colouring depending on camera Toba Ojo 2025-11-27 11:43:10 +00:00
• 1ada8d0966 - Implement CameraFeed context and provider with reducer for state management - able to switch footage on tab clicks Toba Ojo 2025-11-27 10:43:56 +00:00
• 6accac02de Merge pull request 'feature/output-2' (#6) from feature/output-2 into develop TobaOjo 2025-11-27 09:45:11 +00:00
• 3c10ff82cb - updated base for endpoints - added loading states - need to add new form for ftp type #6 feature/output-2 Toba Ojo 2025-11-27 09:43:09 +00:00
• 97ff9a981d - added form fetch and post for optional constants for UTMC Toba Ojo 2025-11-26 15:31:19 +00:00
• e07f769288 - refactor: replace Output component with OutputForms and update related hooks and types Toba Ojo 2025-11-26 13:00:41 +00:00
• 90eb976092 - can get data need to post Toba Ojo 2025-11-25 23:04:40 +00:00
• 225a2a6168 - added add and remove regions on paint selector Toba Ojo 2025-11-25 20:49:11 +00:00
• 2aa0b4377f - minor tweaks to ui across app Toba Ojo 2025-11-25 15:49:53 +00:00
• 0d385061e0 - updated icon Toba Ojo 2025-11-25 15:02:18 +00:00
• 3bbb3166ba Merge pull request '- improved ui for region selector and camera settings' (#5) from feature/cameras-2 into develop TobaOjo 2025-11-25 14:59:25 +00:00
• 18124924f7 - improved ui for region selector and camera settings #5 feature/cameras-2 Toba Ojo 2025-11-25 14:57:18 +00:00
• 6ecb005417 Merge pull request 'feature/outputPage' (#4) from feature/outputPage into develop TobaOjo 2025-11-25 10:23:57 +00:00
• 16829ad5a5 - created forms for JSON, BOF2, UTMC and FTP #4 feature/outputPage Toba Ojo 2025-11-25 10:07:35 +00:00
• ec81392899 started adding to the output form Toba Ojo 2025-11-24 22:07:08 +00:00
• 8c967b3ae2 Merge pull request 'feature/dashboardPage' (#3) from feature/dashboardPage into develop TobaOjo 2025-11-24 20:37:04 +00:00
• 27d2c6a1b9 - improved ui for dashboard - added refetch fn #3 feature/dashboardPage Toba Ojo 2025-11-24 20:32:52 +00:00
• 31b6bd45f5 - improved Dashboard ui Toba Ojo 2025-11-24 16:17:27 +00:00
• c9dde6b992 - improved the system status ui Toba Ojo 2025-11-24 14:54:05 +00:00
• d15a69e6b9 Merge branch 'develop' into feature/dashboardPage Toba Ojo 2025-11-24 13:32:28 +00:00
• b18e11ca6a Merge pull request 'feature/baywatchPage' (#2) from feature/baywatchPage into develop TobaOjo 2025-11-24 13:30:23 +00:00
• 8dd20e409c - minor improvements to painter #2 feature/baywatchPage Toba Ojo 2025-11-24 13:29:00 +00:00
• b084c3016d - improved grid painting and included resizing Toba Ojo 2025-11-24 12:19:51 +00:00
• c5fe6754c3 fixed colour painting and eraser Toba Ojo 2025-11-23 22:36:08 +00:00
• 68711b9087 - started painer on video feed will finish Toba Ojo 2025-11-21 16:01:34 +00:00
• 9deeda1bc3 Merge branch 'develop' into feature/baywatchPage Toba Ojo 2025-11-21 11:47:59 +00:00
• e984c74333 Merge branch 'develop' into feature/dashboardPage Toba Ojo 2025-11-21 11:44:48 +00:00