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

1540 Commits (fe818a73a81a5e6f6a8c060d05dc11d32773eaf2)

Author SHA1 Message Date
Moe 5d50f0d407 fix error on missing frameBuffer when saving snap 2023-06-25 23:24:12 -07:00
Moe 86af8676d3 fix Idle mode status display 2023-06-24 22:56:40 -07:00
Moe ffb511bd15 Manually merge !465 with some changes 2023-05-20 18:25:28 -07:00
Moe f7922269e4 Fix #480 2023-05-10 10:20:45 -07:00
Moe 870f8e1bc2 Fix broken timelapse frame write 2023-05-09 12:38:58 -07:00
Moe b2fc57175c Cycling View for Live Grid 2023-05-03 19:08:42 +00:00
Moe 5d527dbea1 Fix #474 2023-04-30 14:10:26 -07:00
Moe A 26be77e96c Save Frame to Timelapse for Motion Detection+ 2023-04-27 11:23:13 -07:00
Moe A 79482501ec Save Frame to Timelapse for Motion Detection 2023-04-26 22:38:33 -07:00
Moe a3c3f23c3c Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-04-13 11:58:03 -07:00
Moe d7e0ade2d0 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-04-11 13:02:47 -07:00
Moe 1ca8edd78b auto close snapshot worker after 10 seconds if left hanging 2023-04-11 13:02:43 -07:00
Moe f6c34befa2 add protocol prefix to s3-based endpoint 2023-04-06 12:10:38 -07:00
Moe a9ad989873 Merge branch 'droptimelapseframes' into 'dev' 
Droptimelapseframes

See merge request Shinobi-Systems/Shinobi!456
 2023-03-30 03:30:31 +00:00
Moe 1a70e8888c add README viewer to plugin manager 2023-03-29 09:36:49 -07:00
Unicate 545a6f64ff fix typo for function splitForFFMPEG 2023-03-28 09:11:21 +07:00
Moe b2b6d4b3f8 Merge branch 'dev' into 'dev' 
Proposal to resolve error where postData was being sent on a GET request.

See merge request Shinobi-Systems/Shinobi!449
 2023-03-19 17:22:23 +00:00
Moe a0d280e9fe Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-03-17 08:41:59 -07:00
Moe 2e65403317 make size (Cloud Videos and Files) columns longer 2023-03-17 08:41:48 -07:00
Mike Hurley 7be60707c8 Adjust all integer column types to bigint 2023-03-17 15:39:14 +00:00
Moe 2a45650628 make path (Monitors) and size (Videos) columns longer 2023-03-17 08:37:48 -07:00
Moe 301f3a690e !457 fix 2023-03-15 21:00:41 -07:00
Ian Rubado ac5305c2b5 Fixed boolean logic 2023-03-15 22:18:06 -04:00
Ian Rubado af914b4150 New config option to drop timelapse frames 2023-03-15 19:50:57 -04:00
Moe 5e60c26eeb Fix Multi Record Monitor Tags on Event 
commit 57168bd7e9
Author: Moe <github@m03.ca>
Date:   Wed Mar 15 13:25:00 2023 -0700

    clean up UI, rename field to "Trigger Monitors with Tags"

commit 592a1f6144
Author: Moe <github@m03.ca>
Date:   Wed Mar 15 13:24:26 2023 -0700

    fix bindTagLegendForMonitors

commit ac68b16bf6
Author: Moe <github@m03.ca>
Date:   Wed Mar 15 11:47:32 2023 -0700

    Fix Triggering Record by Monitor Tags
 2023-03-15 13:25:43 -07:00
Moe e2f53d2cd2 cleanup p2p init and fix breakge with blank ssl object 2023-03-14 21:33:17 -07:00
Moe 9c010901fd refactor ssl server init, add config.autoRedirect 
- add config.autoRedirect for https redirect
 2023-03-14 21:32:44 -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 dc0fbf5b50 prevent MJPEG web path error on startup while connecting 2023-03-06 19:43:50 -08:00
Moe 1c08c6debe force post body empty for generic ptz GET request 2023-02-24 10:57:00 -08:00
Moe 907816ecc3 minor syntax cleanup 2023-02-24 10:21:45 -08:00
Moe a76dc01fd5 fix labelling for S3-Based Region selection 2023-02-21 14:46:41 -08:00
Moe 0934e1d4c8 fix broken p2p when ssl object is empty 2023-02-20 20:38:19 -08:00
Nabheet Sandhu 33078c97b1 Proposal to resolve error where postData was being sent on a GET request. 2023-02-21 04:04:48 +00:00
Moe 123ee93594 Add wss connectivity for p2p commander 2023-02-20 10:02:14 -08:00
Moe 5d1980f51c minor adjustment to webm compressor 2023-02-17 14:30:10 -08:00
Moe 855894dece Add log output to Video Compressor 2023-02-17 08:34:28 -08:00
Moe 2a407d65b1 Update Admin Account Creation/Edit notices 2023-02-16 22:42:24 -08:00
Moe 46fb7703d0 make substream stream url appear in "streams" param 2023-02-16 21:08:25 -08:00
Moe 01fdc292aa update auto ptz to work with motion detection 2023-02-15 11:45:22 -08:00
Moe 76728c28b5 make cron get conf.json from main process 2023-02-14 14:08:51 -08:00
Moe 1d88824b12 fix missing matrix-js-sdk error 2023-02-14 14:06:39 -08:00
John Doe bc1a60205e Update matrix.js to remove error and fix spacing/tab inconsistencies 2023-02-14 20:34:12 +00:00
Moe bf365b60cd add 404 error to videos not found 2023-02-14 09:52:11 -08:00
Moe b6f11b353a Matrix Notifications Support 2023-02-13 14:28:50 -08:00
Moe 678ba1c36b remove all listeners on processKill 2023-02-09 15:51:30 -08:00
Moe 1fd01db1c3 update fatal error handling in monitor launch 2023-02-03 10:59:22 -08:00
Moe c9d0eb56d1 add missing pass for setNoEventsDetector #455 2023-02-01 09:09:46 -08:00
Moe 7883da689b fix column default 2023-01-31 11:03:32 -08:00
Moe 52d7a5a1de Properly Fix #455 and lay new file for noEventsDetector 2023-01-31 10:13:31 -08:00
Moe b6ae64acfe Update webServerPaths.js 2023-01-31 09:53:22 -08:00
Moe eff879cac2 Revert "Fix #455" 
This reverts commit 3ef778e8d3.
 2023-01-31 09:51:54 -08:00
Moe f4cdd817a7 Add the final fix for the Monitor Refactor 2023-01-31 09:24:48 -08:00
Moe 3ef778e8d3 Fix #455 2023-01-31 09:24:10 -08:00
Moe 9c95f8ea04 make s.readFile fs.readFile promise instead 2023-01-29 20:10:34 -08:00
Moe 17931776ac apply dieseldude fix for monitor launch 2023-01-28 21:06:05 -08:00
Moe 609c7273ed add getStreamDirectory to monitor/utils 2023-01-28 11:13:43 -08:00
Moe fe57a04f9c add some more functions for fileBin control 2023-01-28 11:13:27 -08:00
Moe 05ffca8ca1 streamDir creation on start is async 2023-01-26 13:57:18 -08:00
Moe f2ce615745 fix Refactor Monitor Launch with dieseldude fix 2023-01-26 13:18:44 -08:00
Moe 76144eab9e fix sending mid and ke on webhook detector trigger 2023-01-23 12:26:04 -08:00
Moe 805f70adf6 fix sending eventDetails on webhook detector trigger 2023-01-23 12:23:31 -08:00
Moe b55d4f94af remove webhook time lock for detector event 2023-01-23 08:27:27 -08:00
Moe 0b8facffeb Add timelapse frame creation check 
- runs 10 seconds after next expected frame creation
 2023-01-21 17:10:21 -08:00
Moe d08b04af8a Fix Audio Detector Running when Detector off 2023-01-21 09:08:34 -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 959cd0452e add passing super.json path parameter on camera.js run 2023-01-20 16:24:38 -08:00
Moe 8cc15d8ef5 fix configLocation spelling 2023-01-12 15:40:40 -08:00
Moe 72fbf5a75f allow passing conf.json location as first parameter with running camera.js 2023-01-12 11:09:11 -08:00
Moe 0a45954a1b fix and simplify Motion Detection Accuracy Mode 2023-01-09 08:07:01 -08:00
Moe 7bd153b210 Fix Audio on Embed window 2023-01-08 08:46:15 -08:00
Moe 3bedce02fb raise default length for host and path to 255 2023-01-07 18:29:51 -08:00
Moe 9f68578c5f fix event recording audio selection 2023-01-07 18:29:02 -08:00
Moe 8a2d884664 disable runMultiEventBasedRecord attempt on closed monitor 2022-12-28 17:32:59 -08:00
Moe 621e13f100 Update Monitor Delete function in API 2022-12-28 13:29:51 -08:00
Moe 7b15e33dba make s.addOrEditMonitor return a promise 2022-12-28 13:29:13 -08:00
Moe 13804c0ba9 Update Monitor Delete function 2022-12-28 13:28:55 -08:00
Moe 6799f90e5d update rmdir cases to rm 2022-12-27 15:30:59 -08:00
Moe 7b55da06d5 fix super preferences save 2022-12-26 16:51:55 -08:00
Moe a400580623 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-12-21 12:23:50 -08:00
Moe eb41b2dc7e Update webServerPaths.js 2022-12-21 12:23:48 -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 13aca4591d mqtt outbound send snapshot as base64 2022-12-15 16:53:05 -08:00
Moe a5843f1050 make config.webBlocksPreloaded modifiable by customAutoLoad 2022-12-15 16:51:45 -08:00
Moe b61fc21901 Fix webdav delete 2022-12-15 09:22:49 -08:00
Moe 1dac4512f0 add onEventBasedRecordingStart extender+ 2022-12-14 18:51:44 -08:00
Moe af557e4daa add onEventBasedRecordingStart extender 2022-12-14 18:50:08 -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 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 0a35c99af5 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-12-13 16:14:55 -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 afadceed12 Fix !194 2022-12-13 09:37:53 -08:00
Moe 1491acab2f properly stop plugin process 2022-12-11 20:36:22 -08:00
Moe f88092dd67 remove hardcoded tester for plugins 2022-12-11 14:48:16 -08:00
Moe 9309a9ca98 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-12-11 12:33:55 -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
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
Elad Bar ea304dc5f2 fix configuration get/set for docker 2022-12-10 11:31:46 +02:00
Moe a691a50023 cleanup plugin install handler in ui 2022-12-09 22:59:31 -08:00
Moe f0529b978c fix plugins auto load 2022-12-09 22:58:35 -08:00
Moe ffd50c1d1f parse input_maps in builder 2022-12-09 15:42:14 -08:00
Elad Bar a7f70803d6 Fix register / unregister 2022-12-09 21:18:10 +02:00
Elad Bar 330c6b751a Update configuration save / restore for docker 2022-12-09 21:17:49 +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
Moe e0a3523c67 reverse "Immediate exit requested" operations 2022-12-08 08:46:36 -08:00
Moe 4f523cce92 parse stream_channels in builder 2022-12-08 08:45:48 -08: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 300624f61f Face manager is full working 2022-12-07 23:26:16 +02:00
Moe 37fab5f635 minor cleanup 2022-12-06 22:45:35 -08:00
Moe b69af2b66d remove old 777 chmods 2022-12-06 15:24:16 -08:00
Moe e2c867cc76 fix protocol check for embed api 2022-12-04 10:00:02 -08:00
Moe 1043a2b71c Fix #237 #66 2022-12-04 08:27:46 -08:00
Moe 971c1f045a Fix #130 2022-12-03 18:23:41 -08:00
Moe a028f8684b Fix Input Type JPEG snap grabber 2022-12-03 17:33:29 -08:00
Moe f42be60135 Update monitor.js 2022-12-03 12:11:53 -08:00
Moe ae735c1196 Fix #166 2022-12-03 10:37:56 -08:00
Moe d72273f013 Distinguish Snapshot and JPEG API for custom vf 2022-12-03 09:51:00 -08:00
Moe b73732ff64 catch for snapshot.js inode block 2022-12-03 09:37:23 -08:00
Moe e7951d2fa3 Fix Motion detector video filter addition 2022-12-03 08:05:02 -08:00
Moe ff2afe03fc ffprobe fix double http headers 2022-12-03 07:58:40 -08:00
Moe 07ad5e0995 Update webServerStreamPaths.js 2022-11-29 12:34:47 -08:00
Moe 83d9a52a94 Fix API Permissions for Session Key 2022-11-28 15:54:27 -08:00
Moe d80f397542 Create videoBrowser.js 2022-11-27 15:29:26 -08:00
Moe 17c87dcd46 Delete videobrowser.js 2022-11-27 15:29:19 -08:00
Moe 1bfff28763 Fix reading s.cloudDisksLoaded 2022-11-27 15:26:57 -08:00
Elad Bar e4b9b9bb35 renamed videobrowser to videoBrowser 2022-11-24 20:40:43 +02:00
Elad Bar 8fbce6e47b Add video browser api 2022-11-24 17:59:14 +02: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 52f4bf9a96 simplify bulk video delete 2022-11-22 18:13:31 -08:00
Moe 14b76a4e50 Disable Heartbeat log for P2P 2022-11-22 18:12:36 -08:00
Joshua Seltzer e332929fd0 Fixing sending postData with control URLs. Fixed non-working stop command for PTZ control. 2022-11-18 15:43:55 -05:00
Moe 335cf7398e Change use cases of fs.unlink with fs.rm 2022-11-16 21:10:26 +00:00
Moe 7be65d17d5 replace fs.unlink with fs.rm for file deletion 2022-11-16 07:52:49 -08:00
Moe 61cc2b050b catch amazon file delete error 2022-11-14 10:10:13 -08:00
Moe aad94d9898 Capture Base64 strings from smtp dropInEvent 2022-11-07 14:35:25 -08:00
Moe 78435d12a9 remove default a value from Event Counts table creation 2022-11-03 23:26:07 -07:00
Moe 3fd1e02e38 cleanup login post json response and add timezone param 2022-10-27 16:54:17 -07:00
Moe 1308fcbc78 update monitor status update when starting process 2022-10-27 16:09:54 -07:00
Moe f864982cee Fix Timezone Conversion in Dashboard 2022-10-23 04:07:47 +00:00
Moe c360babc8c Fix passage for failed activation request 2022-10-22 15:30:29 -07:00