ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,487 Commits
84 Branches
6 Tags
94 MiB
Commit Graph

1078 Commits (action-chain)

Author SHA1 Message Date
Moe e22713033d update convertJsonToAccordionHtml 2023-03-28 08:42:58 -07:00
Moe 6c2669fd98 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-03-14 21:17:44 -07:00
Moe d9c1b018a7 Fix Copy Link and Launch for P2P Easy Remote Access 2023-03-14 21:17:06 -07:00
Moe 31a4745c77 Merge branch 'feature-object-tracking' into 'dev' 
Ignore Non-Moving Objects

See merge request Shinobi-Systems/Shinobi!450
 2023-03-11 22:33:12 +00:00
Moe aa19cc13a4 Ignore Non-Moving Objects 2023-03-11 22:33:12 +00:00
Moe dc936e441a Fix displaying objects on live stream when resized 2023-03-09 21:17:52 -08:00
Moe f366f7b0bb safe parsing for input_map_choices in ui 2023-02-24 11:27:11 -08:00
Moe 907816ecc3 minor syntax cleanup 2023-02-24 10:21:45 -08:00
Moe a971c9df7e fix syntax error in accountSettings ui 2023-02-23 14:42:41 -08:00
Moe fa8b46cf1e minor clear up 2023-02-23 09:43:22 -08:00
Moe f1045cc078 clean up some liveGrid variables 2023-02-20 15:14:01 -08:00
Moe f1b6fd8e2a fix initial play state for liveGrid 2023-02-20 14:53:33 -08:00
Moe 980a96196d Make liveGrid more friendly to large number 2023-02-20 14:44:25 -08:00
Moe 2a407d65b1 Update Admin Account Creation/Edit notices 2023-02-16 22:42:24 -08:00
Moe c4b8162e87 Fix Timelapse Frames in AddStorage 
commit 7bc3e8bc06
Author: Moe <github@m03.ca>
Date:   Sat Jan 21 07:40:07 2023 -0800

    Add Percent Share to addStorage for videos and frames

commit 6766a5afc6
Author: Moe <github@m03.ca>
Date:   Mon Jan 16 18:33:43 2023 -0800

    Fix Timelapse Frames counting in AddStorage++

commit e5bd7e61ff
Author: Moe <github@m03.ca>
Date:   Mon Jan 16 17:22:20 2023 -0800

    Fix Timelapse Frames counting in AddStorage+

commit 471acb537f
Author: Moe <github@m03.ca>
Date:   Mon Jan 16 17:08:54 2023 -0800

    Fix Timelapse Frames counting in AddStorage
 2023-01-21 07:41:40 -08:00
Moe c9e2cf8e21 Merge branch 'refactor-monitor-launch' into 'dev' 
Refactor Monitor Launch Sequence

See merge request Shinobi-Systems/Shinobi!430
 2023-01-21 00:49:37 +00:00
Moe 638b0076ad Refactor Monitor Launch Sequence 2023-01-21 00:49:37 +00:00
Moe d9c3a49717 limit videos in live Grid display 2023-01-16 17:15:34 -08:00
Moe 21b6088855 fix double slash in superApiPrefix 2023-01-15 12:10:24 -08:00
Moe 203651efee adjust Accuracy Mode display on Region Editor 2023-01-09 20:54:06 -08:00
Moe e356c0ea24 make Region Editor display detection squares 2023-01-09 08:07:21 -08:00
Moe 7bd153b210 Fix Audio on Embed window 2023-01-08 08:46:15 -08:00
Moe 95eda7e07b fix auto_host path builder 2022-12-31 15:47:26 -08:00
Moe d4e7c3d679 make liveGrid video element have muted parameter on create 2022-12-30 16:17:03 -08:00
Moe 2d071dab92 Update bs5.recentVideos.js 2022-12-29 17:37:28 -08:00
Moe 45f719972e fix monitors list in Recent Videos 2022-12-29 09:41:47 -08:00
Moe d8da2033ff add getMonitorEmbedLink function to UI 2022-12-28 13:31:24 -08:00
Moe 4adf5e329c fix dynamic fileBin row column 2022-12-28 13:30:54 -08:00
Moe 90d5b5610d add convertJsonToAccordionHtml function to UI 2022-12-28 13:30:17 -08:00
Moe 624fb9e2ef Update bs5.fileBin.js 2022-12-27 15:31:21 -08:00
Moe fb5688582a fix duplication of monitor icons in side menu 2022-12-24 10:24:13 -08:00
Moe 7b352f890b negate Copy Settings duplicate query 2022-12-21 18:18:05 -08:00
Moe e17d312224 add install notice to plugin manager 2022-12-21 18:17:53 -08:00
Moe 8570c9667b Merge branch 'deprecate-old-monitor-groups' into 'dev' 
Deprecate Old Monitor Groups in favor of Tags

See merge request Shinobi-Systems/Shinobi!426
 2022-12-21 20:23:11 +00:00
Moe 00deebba9f Deprecate Old Monitor Groups in favor of Tags 2022-12-21 20:23:11 +00:00
Moe c548692754 Update Cloud Uploaders 2022-12-21 19:26:45 +00:00
Moe 7b31b387aa Add Tags to Monitors for quick grouping 
The current Monitor Groups method is now set for deprecation by end of this year.
 2022-12-18 12:34:11 -08:00
Moe 69db95f8d4 Update SQL Queries on Startup 2022-12-17 00:07:23 +00:00
Moe a5843f1050 make config.webBlocksPreloaded modifiable by customAutoLoad 2022-12-15 16:51:45 -08:00
Moe 9cbd305654 Fix embed page over p2p+ 2022-12-15 16:51:15 -08:00
Moe a9458f5476 Fix embed page over p2p 2022-12-14 15:40:28 -08:00
Moe 1a4704268f allow setting clientId for MQTT Outbound 2022-12-14 12:40:07 -08:00
Moe 309a73fdf4 make monitor lists alphabetical+ 2022-12-14 10:14:54 -08:00
Moe 14014c65b8 clean up plugin manager row display 2022-12-14 10:14:31 -08:00
Moe 2d242e8cb5 move customAutoLoad block load in superuser 2022-12-14 10:14:05 -08:00
Moe 42ee884819 Revert "Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev" 
This reverts commit 0a35c99af5, reversing
changes made to 7bc9f754e8.
 2022-12-13 20:38:25 -08:00
Moe af41ff626c Reset Sub-Account form on creation 2022-12-13 17:02:52 -08:00
Moe 0a35c99af5 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-12-13 16:14:55 -08:00
Moe 3a24b7453f sort monitor list selectors alphabetically 2022-12-13 12:04:03 -08:00
Moe b4ed7ff086 Merge branch 'generic-face-manager' into 'dev' 
Face manager as generic solution within super dashboard

See merge request Shinobi-Systems/Shinobi!421
 2022-12-13 19:25:55 +00:00
Moe e6ccfd777c Plugin Manager prettified 2022-12-11 19:30:36 -08:00
Moe 87cd22e7bf Get plugin list from cdn 2022-12-11 15:41:59 -08:00
Moe f88092dd67 remove hardcoded tester for plugins 2022-12-11 14:48:16 -08:00
Moe 04be5de1dd minor code cleanup for plugins ui 2022-12-11 12:33:53 -08:00
Moe 8e3ddd43f7 Update Plugin Manager with command buttons 
- Add Command buttons for additional script launches.
 2022-12-11 12:27:32 -08:00
Moe 7770c812cd prettify plugin install output in UI 2022-12-11 09:40:04 -08:00
Elad Bar 95de2f6348 Merge branch 'dev' into generic-face-manager 
# Conflicts:
#	libs/system/utils.js
#	libs/webServerSuperPaths.js
#	tools/modifyConfiguration.js
 2022-12-10 18:11:47 +02:00
Moe e6276f8dd6 add default options for downloadable plugins 2022-12-09 23:00:01 -08:00
Elad Bar 3bbd0d30db reload DeepStack / CodeProject AI data after registering / unregistering 2022-12-09 22:42:11 +02:00
Elad Bar 335d2598ec fix submit client side failure 2022-12-09 16:39:32 +02:00
Elad Bar 38a6b47f11 Add enableFaceManager configuration parameter, fix missing fields in configuration editor, removed those are available in configuration but without definition in schema 2022-12-09 12:44:42 +02:00
Elad Bar be7132ae23 Merge branch 'dev' into 'generic-face-manager' 
# Conflicts:
#   plugins/deepstack-face/shinobi-deepstack-face.js
#   plugins/deepstack-object/shinobi-deepstack-object.js
 2022-12-08 12:42:02 +00:00
Elad Bar f2fa2c1832 Add support for DeepStack / CodeProject AI to work with the face manager UI 2022-12-08 14:02:56 +02:00
Elad Bar 837bae92cc removed unused parameter 2022-12-07 23:28:54 +02:00
Elad Bar 300624f61f Face manager is full working 2022-12-07 23:26:16 +02:00
Moe a5d04b5d17 Read status for videos re-added to Videos Table 2022-12-06 15:00:23 -08:00
Moe 888e0380c7 Fix GUI bugs with Videos Table 
Thanks Nocona!
 2022-12-06 12:11:48 -08:00
Moe 8553cbfa03 Fix mobile not scrolling over sideMenu monitor list 2022-12-06 12:00:32 -08:00
Moe 302c87f186 Highlight Previewed Video in Videos Table and FileBin 2022-12-05 15:23:52 -08:00
Moe 006fa2d9cc Fix Master Mute for Live Grid 2022-12-05 14:55:14 -08:00
Moe 2086f3554b Add Zip and Download to Videos, FileBin, and Time-lapse Frames 2022-12-04 19:24:04 -08:00
Moe e2c867cc76 fix protocol check for embed api 2022-12-04 10:00:02 -08:00
Moe 67f08b0246 Fix #312 2022-12-03 12:01:55 -08:00
Moe 8cbc8f0ed6 Fix muted live stream on load 2022-12-03 08:35:32 -08:00
Moe aed15d3623 Merge branch 'helping-hand' into 'dev' 
Helping Hand : Active Tutorial

See merge request Shinobi-Systems/Shinobi!413
 2022-12-01 14:09:51 +00:00
Moe 216f303315 Helping Hand : Active Tutorial 2022-12-01 14:09:51 +00:00
Moe dd576d0749 Fix import for Camera Probe 2022-11-30 16:28:12 -08:00
Moe 2fc87629ce fix displaying API Keys 2022-11-28 13:35:51 -08:00
Moe f797521d51 Add Primary Fields to Region Editor 2022-11-27 15:11:35 -08:00
Moe 305eb97c56 Schedules reset on Add New 2022-11-24 16:56:40 -08:00
Moe 0e4781b1a5 Merge branch 'fix-permissions' into 'dev' 
Fix API Key Permissions

See merge request Shinobi-Systems/Shinobi!409
 2022-11-23 20:33:39 +00:00
Moe 9f17d6d139 Fix API Key Permissions 2022-11-23 20:33:39 +00:00
Moe a491b27297 Patch for #422 
if Invalid Date is detected it will try falling back to the method without _d
 2022-11-23 11:39:14 -08:00
Moe 346eb892dc make Monitor States first load on first tab open 2022-11-22 23:06:50 -08:00
Moe fc1d8232b4 make Presets forward to Monitor States 2022-11-22 23:06:23 -08:00
Moe 2a4f6c0573 Lower Monitor States minimum selection requirement 2022-11-22 22:39:18 -08:00
Moe b277177d6a Fix Scheduler loading and selection 2022-11-22 22:38:55 -08:00
Moe f6b45ff89e make videosTable thumbnail check more strict 2022-11-22 18:14:58 -08:00
Moe cd40229d77 Make dashboardOptions unique to logged in user 2022-11-19 12:37:33 -08:00
Moe bcbc67bd96 disable Live Grid drag and drop on mobile 2022-11-15 14:23:09 -08:00
Moe 213f391675 Fix Power Video player 2022-11-10 08:48:44 -08:00
Moe 494dc65fcc make slicer not act unless open 2022-11-10 06:50:54 -08:00
Moe be419be57d Make start and end time match Power Video for all searches 
- only happens if no start and end time are set during init of the calendar element
 2022-11-07 16:18:35 -08:00
Moe 79a7905a4f Make Events light up monitor item border 2022-11-07 15:12:16 -08:00
Moe 7e8e9739a5 fix power viewer displaying Cloud Videos 2022-11-07 14:34:58 -08:00
Moe 3234074bbc Delete FileBin files with multiselect 2022-11-07 11:09:28 -08:00
Moe 6686dfc342 Add stringContains definition to front end 2022-11-07 06:48:32 -08:00
Moe 3f14201cef fix live grid monitorItem close errors 2022-11-04 12:17:53 -07:00
Moe 8a36f57af3 disable flaky error check for video elements in Live Grid 2022-11-04 09:17:37 -07:00
Moe 0d28a2884c add additional options to basic video player 2022-10-30 19:13:17 -07:00
Moe a3f188c126 Update bs5.studio.css 2022-10-29 09:45:58 -07:00
Moe 1bc8bb2b71 Update cursor icon in Video Slicer 2022-10-29 09:41:58 -07:00
Moe 34f58dc1ca add some notes to event tags in video cards of Live Grid blocks 2022-10-27 17:53:29 -07:00
Moe 272d969335 Update getSelectedTime for searches 2022-10-27 16:26:02 -07:00
Moe 3902e0cd42 Fix Calendar initial date selected 2022-10-27 16:25:35 -07:00
Moe 807c0c10cb make Live Grid remember logs open, clean up Live Grid html and css 2022-10-27 11:54:23 -07:00
Moe 9db0b0f72d Fix Live Grid stream block css 2022-10-27 11:13:40 -07:00
Moe 6b28a3d422 Fix Superuser page access over P2P 2022-10-25 09:17:44 -07:00
Moe 35b54db091 Fix Live Grid Monitor Item height when in mobile width 2022-10-24 12:19:21 -07:00
Moe f864982cee Fix Timezone Conversion in Dashboard 2022-10-23 04:07:47 +00:00
Moe dcc18e9083 Update and Fix Live Grid (gridstack updated from 0.3 to 7.0) 2022-10-21 18:28:36 -07:00
Moe 696bbd2771 fix embed view (popout) 2022-10-21 15:49:20 -07:00
Moe d603bbb03f Live Grid : Error Handling for video stream-elements+ 2022-10-21 15:37:05 -07:00
Moe eeffb79601 Live Grid : Error Handling for video stream-elements+ 2022-10-20 21:04:09 -07:00
Moe 981cf5ab05 Live Grid : Error Handling for video stream-elements 2022-10-20 08:42:58 -07:00
Moe d4383dfe45 fix FileBin links in All Monitors list 2022-10-18 16:52:51 -07:00
Moe 18204c6673 Add "All Monitors" option to FileBin search 2022-10-18 16:50:12 -07:00
Moe 242aaf81ef fix colors on new dropdown menu in Video List 2022-10-18 10:18:27 -07:00
Moe 9a8dd10afc bring back old Signal Check for HLS, FLV, and Poseidon 2022-10-18 10:18:06 -07:00
Moe dfe2e3e1bf Fix Monitor Settings Monitor selector appearance 2022-10-18 10:12:14 -07:00
Moe 5e839a78f7 Updated Signal (Stream) Check for Live Grid 2022-10-16 19:27:52 -07:00
Moe dc247557b4 Add Video Slicer 2022-10-16 23:34:30 +00:00
Moe a8c7d8182e Merge branch 'video-slicer' into 'dev' 
# Conflicts:
#   web/assets/js/bs5.videosTable.js
 2022-10-16 22:47:14 +00:00
Moe a29381a338 minor adjustment to parameter name on event rows in videoPlayer 2022-10-16 12:14:26 -07:00
Moe df5a863345 Add Dropdown menu to Videos Table rows 2022-10-16 12:13:09 -07:00
Moe b250e8a7d5 add loadedEventsInMemory container 2022-10-16 12:12:28 -07:00
Moe b54d08ad36 add two more options to mqttOut trigger 
+ insertCompletedVideoExtender
+ onEventBasedRecordingComplete
 2022-10-11 20:20:04 -07:00
Moe 26eb1c1966 fix embed reloading stream if monitor state changes+ 2022-10-08 19:28:14 -07:00
Moe 10bfce9563 Make Plugin Manager use conf.json for "Enabled" status 2022-10-08 18:49:31 -07:00
Moe d55053f35d clean up some websocket handling 2022-10-08 18:14:00 -07:00
Moe 30d39b9fac Default Event Filters for a new Monitor 2022-10-08 18:09:41 -07:00
Moe 43bdaabb19 fix embed reloading stream if monitor state changes 2022-10-08 17:55:13 -07:00
Moe 7e3f9589d8 update test trigger button to be Motion and Object testers 2022-10-08 17:54:55 -07:00
Moe 4cc9f8f31f Fix Drawing Object Detection data (Matrix Data) in embed 2022-10-08 17:37:19 -07:00
Moe 97995b020d Fix reloading Live Stream in Region Editor after tabAway 2022-10-08 16:57:48 -07:00
Moe 3a7d30e362 mild refactor for embed live stream feature 2022-10-08 16:28:12 -07:00
Moe 49b518d595 Fix Broken Mini Motion chart for PowerViewer 2022-10-07 17:38:15 -07:00
Moe 7cdfbb2af1 Video Slicer : fix preview display mismatch 2022-10-02 20:57:46 -07:00
Moe f1fb5cc9e3 make base control visible for video in slicer 2022-10-02 20:01:20 -07:00
Moe 16fe5c3dec Default mute on for Live Grid 2022-10-02 11:48:59 -07:00
Moe 0337fd4d12 Fix FFprboe launch from Monitor Settings 2022-10-02 10:26:19 -07:00
Moe 5bb1e3b836 Video Slicer : clear completed video list on new video load 2022-10-01 15:06:00 -07:00
Moe 15c71ecbe7 Video Slicer : humanized seek positioning, cleanup performance 2022-10-01 15:02:57 -07:00
Moe a66e0d6e02 Video Slicer : scale labels on time strip 2022-10-01 13:02:50 -07:00
Moe 7b589dc8e1 Fix displaying time-lapse video completion notice 2022-10-01 12:55:39 -07:00
Moe 1321e8cfca Show Completed Slicing after completion 2022-10-01 12:54:43 -07:00
Moe ac0b33c0c9 Add Preview for Video Slicer (Studio)+ 
Add Seekbar
 2022-10-01 12:07:55 -07:00
Moe 2541225e83 Add Preview for Video Slicer (Studio) 2022-09-30 18:22:11 -07:00
Moe b2ee975f29 Add Studio (Currently only a Video Slicer) 
- only function set with basic UI to slice a video
 2022-09-29 23:32:09 -07:00
Moe 066d5a4d58 some handling for videos that have no monitor associated in db 2022-09-29 20:57:01 -07:00