Commit Graph

382 Commits (1dac4512f0d70363350ec7c1dea7de4f72adad77)

Author SHA1 Message Date
Moe ceda85e5db Update ZoneMinder Monitors Import+ 2022-08-11 16:43:29 -07:00
Moe 850b49e635 Update ZoneMinder Monitors Import 2022-08-11 16:37:59 -07:00
Moe 5c2a83b91d Fix bg from old merge 2022-08-10 21:38:59 -07:00
Moe 38c128a4f1 Merge branch 'fix-camera-progress-bar' into 'dev'
UI: Fix camera progress bar

See merge request Shinobi-Systems/Shinobi!371
2022-08-10 00:18:59 +00:00
Moe 870c65d277 Merge branch 'dev' into 'dev'
Name Monitors in PowerVideoViewer by name not ID

See merge request Shinobi-Systems/Shinobi!315
2022-08-09 23:36:10 +00:00
Moe 220c55449d Add Toggle for Cloud Videos set in Videos Table 2022-08-08 14:10:20 -07:00
Moe 428666cc64 Add Permission checks for Live Stream block buttons 2022-08-08 11:53:35 -07:00
Moe 69d3392b15 Fix selecting Trigger Camera Groups 2022-08-08 11:18:05 -07:00
Antonín Skala e9b47f8da5
Add requestetd changes 2022-08-08 10:08:42 +02:00
Moe c4627b3c62 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-08-07 21:26:35 -07:00
Moe 1dcf5607e2 fix selector bug on login page 2022-08-07 21:26:26 -07:00
Moe cb31a0ee61 Merge branch 'dev' into 'dev'
Cleanup and Jquery update

See merge request Shinobi-Systems/Shinobi!376
2022-08-08 03:50:43 +00:00
Gamertech 3b17bc733a Changed login splash image to a local avif 2022-08-08 12:45:00 +10:00
Moe c3c97ce80b Merge branch 'fix-sub-account-permissions' into 'dev'
Refactor Sub Account Permissions

See merge request Shinobi-Systems/Shinobi!377
2022-08-08 02:12:40 +00:00
Moe 428d17cf87 add some UI fixes for displaying Unauthorized features for Sub-Acc 2022-08-07 16:27:03 -07:00
Antonín Skala f634ab394e
Status bar - Dynamic update of Active monitors 2022-08-05 12:07:39 +02:00
Gamertech ed02aa8d5d Matched package-lock.json
Fixed console typo
Removed empty div breaking the normal-view header for Chrome and blocking favicon load
Removed call for non-existent stylesheet
2022-08-05 18:13:10 +10:00
Moe 1112eb7284 minor cleanup to UI 2022-08-04 11:17:53 -07:00
Moe 2deb91bd9a Fix saving Trigger Camera Groups 2022-07-31 23:04:28 -07:00
Moe a61868fbb9 time-lapse viewer untick master checkbox if not all are selected 2022-07-30 18:44:50 -07:00
Moe 3f9ca074b7 minor tweak to time-lapse ui 2022-07-30 15:08:37 -07:00
Moe fbacafdd94 Add bulk deletion to time-lapse viewer and some minor cleanup 2022-07-30 12:09:10 -07:00
Antonín Skala 5d660c4def
improve camera count readability 2022-07-29 23:12:52 +02:00
Antonín Skala e0319d2a62
Fix camera progress bar 2022-07-29 23:11:30 +02:00
Antonín Skala 3bfe1ff5c4
Fix disk indicator-percent 2022-07-26 17:08:04 +02:00
Antonín Skala 962a38bdc0
Add box-wraper to keep same layout 2022-07-26 17:00:39 +02:00
Moe e5b23fa2fe Fix label for No Trigger event in MQTT outbound 2022-07-24 08:51:15 -07:00
Moe 70401b5631 Add uiVisibilityConditions for niche field visibility requirements
+ fixes the missing settings for Stream Types that require encoding but did not swap the Video Codec when it was visible before selecting.
2022-07-21 17:11:08 -07:00
Moe b52269b6b8 fix video appear upon completion for live grid blocks 2022-07-20 20:21:39 -07:00
Moe 17e7fdc15a Add Accuracy Mode for Motion Detection 2022-07-17 23:48:10 -07:00
Moe 5724c88a2e Fix double click to full screen live stream 2022-07-14 22:11:32 -07:00
Moe 1a65bb5627 fix drawing day cards with no frames 2022-07-14 11:06:04 -07:00
Moe 9560348d2f Undo breakage to dashboard-base 2022-07-13 20:55:55 -07:00
Moe ed289c992a Show a thumbnail that happened during the video in Videos Table 2022-07-13 20:54:21 -07:00
Moe ee31bc5d90 stop region editor live stream on tabAway 2022-07-12 19:10:08 -07:00
Moe 5a1ce93986 Fix Recent Videos not displaying if no videos but has frames 2022-07-12 19:09:48 -07:00
Moe bc8131ac30 make power video pause videos on tabAway 2022-07-12 19:09:20 -07:00
Moe 4289a2eff7 Fix Recent Videos performance hit if no data found on first scan 2022-07-12 17:59:14 -07:00
Moe d350ab7a05 Show placeholder image in Region Editor for Monitors not running 2022-07-12 15:24:09 -07:00
Moe 8778e2b582 Clean up regular video player ui 2022-07-12 15:14:39 -07:00
Moe 2c63c00019 Show videoPlayer detection better (not hide when hovering data) 2022-07-12 15:13:25 -07:00
Moe 4ab3eb76d3 Clean up regular video player ui and fix quick seek by event click 2022-07-12 15:09:14 -07:00
Moe 9438b16b27 Fix closing video player tab if video is deleted while its open 2022-07-12 15:08:46 -07:00
Moe c4d371d36d hide fix video button for now 2022-07-12 14:33:11 -07:00
Moe 86d02271ac Fix Power Viewer continuity 2022-07-12 14:26:34 -07:00
Moe ce8c6b1354 Fix Power Viewer over P2P 2022-07-12 11:59:24 -07:00
Moe d989dbcc25 Fix deleting monitor from Monitor Settings window 2022-07-12 11:13:01 -07:00
Moe 85ab76178f Add Fix button to reprocess Videos from Videos Table
- This is for when a video has become corrupt and you want to attempt making it playable with the content it has.
+ move stitchMp4Files function
2022-07-07 15:53:46 -07:00
Moe f3cad3dca2 Make Recent Videos display loading icon 2022-07-07 12:31:59 -07:00
Moe 7741796f77 Cleanup Day Card video selection 2022-07-07 11:03:29 -07:00
Moe 521cb9bc77 Day Card only request frame if it isn't loaded or not already loading 2022-07-07 10:36:20 -07:00
Moe 2af8a2f3d8 Setup Websocket Callback 2022-07-06 21:24:49 -07:00
Moe 4a3eec7429 Setup Websocket Callback 2022-07-06 21:24:24 -07:00
Moe 8d42e1d18b make object list display in Videos table 2022-07-06 17:21:46 -07:00
Moe 9366d62090 Make Day Cards show if frames exist but no videos 2022-07-06 17:21:26 -07:00
Moe 450b7ab855 Option to Search for videos by Object Tag
this feature will only work on detections and recordings made after this update is applied. Previous detections are not searchable in this way.
2022-07-05 21:59:37 -07:00
Moe 5c920205f6 Fix Videos Table file links over p2p 2022-07-05 19:23:51 -07:00
Moe 222c13c3fc Save Live Grid positions when a tile is resized 2022-07-05 09:45:16 -07:00
Moe 39d99d0c95 Fix FileBin file links over p2p 2022-07-05 07:46:05 -07:00
Moe e8a11b7b12 Fix ONVIF Device Manager load first monitor on open 2022-07-04 22:13:27 -07:00
Moe 83750bb20e add timelapseVideoBuild to Websocket API 2022-07-04 20:29:26 -07:00
Moe 62d7b8d7f0 Fix onOtherWebSocketMessagesExtensions exec placement 2022-07-04 20:24:00 -07:00
Moe a50613c0b9 Fix dontShowDetection toggle state 2022-07-03 21:08:51 -07:00
Moe 364822f3a4 Lightly Refactor PTZ controls, Add PTZ Hold to move and release to stop 2022-07-03 13:50:16 -07:00
Moe 2537cf26ff Videos Table add button to launch Video Player with Events view 2022-07-01 19:54:24 -07:00
Moe 02871f86c5 ONVIF Scanner save monitor name as the IP Address 2022-07-01 19:45:17 -07:00
Moe 0ae6bc8419 Rename Traditional Recording to Event-Based Recording, +
+ Re-arrange some fields and make them only show when advanced is toggled on in the Monitor Settings
+ removal of some unused fields
2022-06-30 21:16:32 -07:00
Moe bb749f61e2 More descriptive Disk Usage indicator 2022-06-29 20:49:17 -07:00
Moe 6938850113 Display Usage for Videos, FileBin and Timelapse Frames in divided bar 2022-06-29 20:35:21 -07:00
Moe 7610f9a4c6 minor cleanup 2022-06-29 18:13:31 -07:00
Moe 36943fa192 Add Batch Download and Delete to Videos table 2022-06-29 18:06:15 -07:00
Moe dea230e93a minor cleanup 2022-06-28 19:56:01 -07:00
Moe 371085a3ba fix some syntax errors 2022-06-28 18:43:53 -07:00
Moe 026ee4d6a2 use standard videos list for "Videos" tab 2022-06-27 23:33:00 -07:00
Moe 7fbb0cdfcb Add simple video viewer 2022-06-27 16:31:01 -07:00
Moe 8c9262a9f2 Better FileBin listing 2022-06-27 15:49:24 -07:00
Moe 9711472dda add quick play to built timelapse video, further cleanup 2022-06-27 15:03:55 -07:00
Moe 5f0b207003 timelapse video build progress indicator cleanup 2022-06-27 14:23:49 -07:00
Moe bf57f8b8a1 add dismiss button for Timelapse Video Build progress when completed 2022-06-27 13:31:12 -07:00
Moe 8d8c0400d2 Add Preview to FileBin viewer 2022-06-27 00:31:27 -07:00
Moe 7c51aef841 Display progress of build in Side Menu 2022-06-27 00:30:57 -07:00
Moe 4b42dd6ed4 Add "Don't Show Detection" button to Live Grid options
+ minor cleanup to base.js
2022-06-26 00:57:59 -07:00
Moe 8f0f7f0d3e Add FileBin list viewer 2022-06-26 00:57:18 -07:00
Moe 137770b891 Update Timelapse Video Build and Download 2022-06-26 00:56:15 -07:00
Moe a53f63e2f4 Fix Live Grid stream element stretch toggle 2022-06-25 12:37:09 -07:00
Moe ad12871c20 Update Bootstrap Table, Add FileBin file viewer framework 2022-06-25 00:10:17 -07:00
Moe 4ceb8bb981 Fix Sub-Account Manager when used through P2P 2022-06-23 18:17:46 -07:00
Moe 069c91d3cc Monitors List : copy stream url completely 2022-06-23 18:08:57 -07:00
Moe 4370959952 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-06-22 16:13:58 -07:00
Moe 2fc0cf4059 Fix logout button redirect 2022-06-22 16:13:52 -07:00
Chris Miceli a8775ec370 Improvements to timelapse viewer
fix text
remove change handler
2022-06-21 23:17:30 -05:00
Chris Miceli 5da7be787d Merge branch 'dev' into timelapse 2022-06-21 23:13:15 -05:00
Moe 1029e15b19 Allow Hiding SideMenu (Kiosk Mode)+ 2022-06-17 15:36:43 -07:00
Moe e1821dc83e Allow Hiding SideMenu (Kiosk Mode) 2022-06-17 15:33:14 -07:00
Moe 0594bf2c3c Add Clock to Dashboard v3 2022-06-17 14:46:18 -07:00
Moe 0166fe5ad3 Fix Order Streams in Live Grid 2022-06-17 13:49:16 -07:00
Moe a63e08f48e add Username and Password fields to MQTT Outbound 2022-06-06 13:32:58 -07:00
Moe ce406f6fd9 Hide Max Storage Amount notice for Sub-Account 2022-06-01 13:11:01 -07:00
Moe d42cbbb10c Update bs5.liveGrid.js 2022-05-25 01:01:47 -07:00
Moe 3b1c13fd63 getting events in the dashboard forces 300 row limit 2022-05-21 07:17:58 -07:00
Moe 304e3d0280 fix updating Email address for Sub-Account 2022-05-16 13:40:42 -07:00
Moe 0398e08001 Button to disable Stream stretch in Live Grid 2022-05-10 18:57:41 -07:00
Moe 9da31e6aba fix display of monitor status in other languages 2022-05-04 11:05:37 -07:00
Moe f10f078bd6 minor cleanup to region editor 2022-04-29 10:47:27 -07:00
Moe 219e9f1011 fix seeking visualization for power video viewer 2022-04-29 10:33:26 -07:00
Moe 6a971e3151 add mute and minor fixes to Power Video Viewer 2022-04-29 10:10:37 -07:00
Moe 7a498f69aa getApiPrefix can now get "admin" prefix 2022-04-27 10:15:35 -07:00
Moe 6a0b4577c6 fix signal checker 2022-04-27 10:09:52 -07:00
Moe b456c21ac6 Fix #380 2022-04-27 07:19:47 -07:00
Moe f259ac15d2 fix account password change 2022-04-27 06:56:05 -07:00
Moe a0050e2eee make monitorEditorSelectedMonitor a global value 2022-04-12 15:03:59 -07:00
Moe e4a090b0ee adjust day card display date to be based on first video 2022-03-28 21:28:28 -07:00
Moe 3e7ad2d319 region editor init live stream on first open 2022-03-28 21:22:37 -07:00
Moe 1281bdb7fc fix relative video pathing 2022-03-28 21:14:56 -07:00
Moe 56e63f0fac Fix Poseidon on Dynamic Substream Live Grid view 2022-02-20 19:44:03 -08:00
Moe 7c875bffac fix power viewer loading 2022-02-13 16:17:57 -08:00
Moe b894c1c7eb fix side monitor list order 2022-02-12 21:42:11 -08:00
Moe c27fea3942 delete monitor from settings -> go back one tab and reset settings editor 2022-02-10 11:15:48 -08:00
Moe 8740f39cc6 add heartbeat on client side 2022-01-20 13:01:15 -08:00
Moe 19eb9cb172 change Primay Input default to 0 when using Additional Input Maps 2022-01-14 11:40:39 -08:00
Moe 269e35284b Modify Monitor Settings Defaults
- Save Events to SQL set to Yes
- Recording Timeout set to 0.5 minutes instead of 10 minutes
- Timeout Reset on Next Event set to Yes
2021-12-29 08:30:34 -08:00
Moe 800604ba60 Day Cards : min-height for img (so deleted images don't alter the height) 2021-12-26 12:10:25 -08:00
Moe c456222864 Day Cards : change frame flipper to use <img> 2021-12-23 07:46:13 -08:00
Moe cddedf5a2f Day Cards : add spacing where no videos exist, frame display not rely on video 2021-12-22 10:23:55 -08:00
Moe 5fd114b750 Allow Selecting certain time frames on Recent Videos 2021-12-19 07:10:33 -08:00
Moe 229fd62ae4 clean up daycard operation 2021-12-17 10:30:18 -08:00
Moe 6d91234f11 Recent Videos now shows videos as "Day Cards" 2021-12-11 14:03:41 -08:00
Moe 7b025de306 add mechanism for displaying a whole day in one card 2021-12-10 22:27:25 -08:00
Moe c945d53d9f tweak auto-closing of Substreams+ 2021-12-08 07:41:32 -08:00
Moe fec699af9c update timelapse video build check interval 2021-12-07 21:55:50 -08:00
Moe e27c49f93f run visibility check on initial load of timelpase frames 2021-12-07 14:40:59 -08:00
Moe ba33f22507 add lazyload to timelapse frame results in UI 2021-12-06 22:45:51 -08:00
Moe 494bed8d25 fix timelapse video build+ 2021-12-06 22:35:19 -08:00
Moe 3cf38a7843 Substream can now be used for On-Demand Live Stream on Dashboard 2021-12-06 15:45:25 -08:00
Moe ea5120fded show available jpeg frames over video rows with mouseover 2021-12-05 21:57:12 -08:00
Moe 5204df7a40 video delete remove UI elements fix 2021-12-05 12:23:51 -08:00
Moe 2f89fc91cc fix importing m3u8 2021-12-04 21:59:34 -08:00
Moe 4bb4828acf Add Substream Default values and some validation for startup 2021-12-04 21:59:26 -08:00
Moe baa1986d80 if selected tab is same as previous then go previous instead 2021-12-04 21:37:40 -08:00
Moe f32010c3fc liveGrid only request Recent Videos in list when shown 2021-12-04 21:14:39 -08:00
Moe 1ab4cac88f shake Logs side menu icon when new log is streamed to dashboard 2021-12-04 21:10:59 -08:00
Moe 0767312719 fix log UI cache clearing+ 2021-12-04 19:49:39 -08:00
Moe 6b3804a5b4 Add Dynamic Substream Toggle button 2021-12-04 19:49:25 -08:00
Moe d46789b9b2 auto open side menu when monitor settings is opened 2021-12-04 19:37:31 -08:00
Moe 2532a899ef dashboard remember if side menu is collapsed 2021-12-04 19:15:25 -08:00
Moe 6c31a11517 fix log UI cache clearing 2021-12-04 19:14:25 -08:00
Moe 215a6f4701 hide Control option on liveGrid element if control is disabled on monitor 2021-12-04 19:14:02 -08:00
Moe 102eee923d add help page 2021-12-04 19:13:27 -08:00
Moe e0edef691b minor UI cleanup 2021-12-04 11:22:10 -08:00
Moe dda4916bc3 fix side sub menu draw 2021-12-04 11:03:17 -08:00
Moe 99515e0ee7 fix Additional Input Map not loading fields++ 2021-12-04 08:57:45 -08:00
Moe 36fe174877 fix Additional Input Map not loading fields+ 2021-12-04 08:42:49 -08:00
Moe 80f5225191 remove frame limit on timelapse frame retrieval 2021-12-03 10:20:56 -08:00
Moe 6469a7e063 fix Sub Account Manager delete 2021-11-29 18:52:37 -08:00
Moe 2084b0b8c8 fix Sub Account Manager Edit new account before page refresh and delete 2021-11-29 17:46:55 -08:00
Moe c4f78ede6a fix posting on ONVIF Device Manager Endpoints 2021-11-23 22:56:50 -08:00
Moe 0cc3344489 Port over ONVIF Device Manager 2021-11-23 21:05:56 -08:00
Moe ec5b12d57d fix videos rows showing event frames from other monitors 2021-11-23 15:32:57 -08:00
Moe 2cab5c3063 re-arrange power video 2021-11-23 15:32:35 -08:00
Moe f7dd4bae91 P2P Fix for Dashboard V3 2021-11-20 13:08:59 -08:00
Moe cfbb528770 Integrate MQTT Outbound Messages 0.1 2021-11-15 00:08:37 -08:00
Moe 1cc56ca0e8 Integrate MQTT Event Intake 0.1++ 2021-11-14 08:38:22 -08:00
Moe c7e84111e3 Integrate MQTT Event Intake 0.1+ 2021-11-13 14:51:40 -08:00
Moe fbbe8fb0c7 Integrate MQTT Event Intake 0.1 2021-11-12 18:32:53 -08:00
Moe 0d9a99b56e change power viewer to use select field for monitors list 2021-11-11 22:08:15 -08:00
Moe c7336ecf02 minor fixes and cleanup 2021-11-11 22:07:32 -08:00
Moe 2653fb8e41 allow monitor grouping from simple monitor settings 2021-11-09 08:26:58 -08:00
Moe 575c268085 make multiple selects not require holding CTRL 2021-11-08 22:01:31 -08:00
Moe 7c1f4b915a only show first 12 event images in video row 2021-11-08 16:12:47 -08:00
Moe 17f0e909bd run dashboard functions on start once 2021-11-08 16:10:57 -08:00
Moe 85367cdc25 fix region editor live stream load on monitor switch 2021-11-08 16:10:17 -08:00
Moe 4c53cde522 hide Monitor ID in monitor list to make more human 2021-11-08 16:09:55 -08:00
Moe 27bd0a60f7 fix monitor mute and unmute in Live Grid 2021-11-08 14:47:25 -08:00
Moe bfcf3de27d update dashboard event handlers 2021-11-08 14:28:10 -08:00
Moe 822d7d1229 Add Modular method to add Stream Types + 2021-11-06 11:28:33 -07:00
Moe 40b4669d01 Add Modular method to add Stream Types, Remove Integrated H.265 Support
- H.265 Support must now be added by user intervention via a Custom Auto Load Module. You can install the module easily by using the zip link in the Super User panel's Custom Auto Load manager.
Repository : https://gitlab.com/moeiscool/shinobi-h265-support
Zip Link : https://gitlab.com/moeiscool/shinobi-h265-support/-/archive/main/shinobi-h265-support-main.zip

Why? the library libde265.js is great but it is not a proper fit for the application. Moving onward it will be nice to allow new stream types to be easily added as well as get ready to try a different H.265 library for our web viewing pleasure.
2021-11-05 15:59:42 -07:00
Moe 1aff1c989a fix nested forms in monitorList 2021-11-03 20:47:03 -07:00
Moe 199d51424b port calendar view into dashboard v3 2021-11-02 21:16:06 -07:00
Moe 91f8af3002 allow grouping with brackets on event filter conditions 2021-11-02 18:32:24 -07:00
Moe 2adde7dfde add front end legend for detector filter operators 2021-11-01 15:01:45 -07:00
Moe bd1f431269 monitor card html build as modular global function 2021-11-01 15:01:24 -07:00
Moe 1215ec4fff show Max Storage Amount notice on login if set to lower than 20GB 2021-10-27 16:18:52 -07:00
Moe 72da06a78f Show Number of Events for last 24 hours 2021-10-27 10:14:24 -07:00
Moe b554a5fc09 Monitor ID selector for Recent Videos window 2021-10-26 17:21:53 -07:00
Moe cb5bdd4fff minor cleanup 2021-10-24 16:35:30 -07:00
Moe 0f522cacfd fix monitor group selection in monitor settings 2021-10-24 16:35:15 -07:00
Moe 92fc95c401 add Tab specific element displaying 2021-10-24 16:35:00 -07:00
Moe 4e76de959b Add left and right controls to Stream Carousel 2021-10-24 10:13:08 -07:00
Moe 70f76e2a46 setting applicationName client side 2021-10-23 23:34:41 -07:00
Moe 351bc87b24 Add Close All Monitors link to Live Grid sub menu 2021-10-23 23:24:58 -07:00
Moe 23cbb76416 add Power Video Viewer to Dashboard v3
Its not actually needed anymore now that Videos rows display events and snapshots within them.
2021-10-23 22:39:05 -07:00
Moe 8dbfce7e28 minor cleanup 2021-10-23 17:28:26 -07:00
Moe 06ec76009b Make Account Settings refresh field inputs if changed in another window 2021-10-23 17:26:36 -07:00
Moe 0258fcc922 fix ONVIF Scanner 2021-10-23 17:25:57 -07:00
Moe 105afb7a6e allow better setting logo from configuration 2021-10-20 17:16:57 -07:00
Moe a75fb21f46 remove some href="#" (fixed font color by modding bootstrap theme css) 2021-10-19 19:35:26 -07:00
Moe f345d6dbfa modify a:not([href]) class 2021-10-19 19:34:31 -07:00
Moe 0f174012ab fix more text-white dark translation 2021-10-19 19:33:41 -07:00
Moe fa062c9e19 clean up region editor+ 2021-10-18 13:44:29 -07:00
Moe aed3f5ee84 clean up region editor 2021-10-18 13:31:02 -07:00