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

3163 Commits (2a407d65b13214094163c748544748e5e4d84670)

Author SHA1 Message Date
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
Moe bf4a40a3a5 Merge branch 'typingcroc-dev-patch-16163' into 'dev' 
Update matrix.js to remove error and fix spacing/tab inconsistencies

See merge request Shinobi-Systems/Shinobi!447
 2023-02-14 20:38:00 +00: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 7bed07f94b Revert "Merge branch 'adding-jetson-codecs' into 'dev'" 
This reverts commit 1e1d62e792, reversing
changes made to 1fd01db1c3.
 2023-02-07 15:29:14 -08:00
Moe 1b2acafe6b Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-02-07 15:29:03 -08:00
Moe 1e1d62e792 Merge branch 'adding-jetson-codecs' into 'dev' 
Add Jetson Nano Codec choices and FFmpeg installer

See merge request Shinobi-Systems/Shinobi!442
 2023-02-07 23:00:30 +00:00
Moe 8156494124 Update conf.sample.json 2023-02-05 22:12:16 -08:00
Alexander Zhilko 56284749b8 adding jetson support 2023-02-04 11:11:13 +02: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 e7f2b443c1 Merge branch 'dev' into 'master' 
Holy Cannoli

See merge request Shinobi-Systems/Shinobi!441
 2023-01-31 19:11:01 +00: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 3f74951e74 Merge branch 'dev' into 'master' 
Old York : Critical Fixes

See merge request Shinobi-Systems/Shinobi!438
 2023-01-29 05:08:07 +00:00
Moe 17931776ac apply dieseldude fix for monitor launch 2023-01-28 21:06:05 -08:00
Moe c636526419 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-01-28 11:14:28 -08:00
Moe 7132f32b0d Add Disclaimer for Audio Recording and location legalities 2023-01-28 11:14:25 -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 8f1bcf2205 Merge branch 'update_config_documentation' into 'dev' 
making config file documentation more clear

See merge request Shinobi-Systems/Shinobi!432
 2023-01-26 22:27:19 +00:00
Moe 05ffca8ca1 streamDir creation on start is async 2023-01-26 13:57:18 -08:00
Moe f2c6578b82 Merge branch 'dev' into 'master' 
Swirl of Shamshir : Critical Fixes

See merge request Shinobi-Systems/Shinobi!437
 2023-01-26 21:48:16 +00: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 23f710a206 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-01-20 16:22:25 -08:00
Moe 07584db326 Merge branch 'dev' into 'master' 
Maroon 6 - Bug Fixes and Refactors

See merge request Shinobi-Systems/Shinobi!428
 2023-01-20 23:39:53 +00:00
Moe 2886441e01 Merge branch 'fix-docker-pipeline' into 'dev' 
Fix docker pipeline

See merge request Shinobi-Systems/Shinobi!436
 2023-01-19 18:55:57 +00:00
Elad Bar 81528d1295 Fix docker pipeline 2023-01-19 17:38:16 +02: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