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 fe818a73a8 Motostoke City 2025-02-06 03:41:12 +00:00
Moe 91e240e1cf fix substream end event signal 2024-10-27 17:27:37 -07:00
Moe 5d593f3d84 Undo Substream changes 2024-10-27 17:18:33 -07:00
Moe 47e612cbc9 trim search query for videos object column 2024-10-24 20:04:15 -07:00
Moe 0c5485409d Use Old ONVIF Scanner 2024-10-24 20:01:15 -07:00
Moe 384752a422 allow comma delimited searchQuery 2024-10-24 16:35:24 -07:00
Moe 0331a70555 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2024-10-21 17:32:46 -07:00
Moe ed4ead0269 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2024-10-21 17:31:12 -07:00
Moe e064dcde54 Allow Recording Overlap with Event-Based Recording (optional) 2024-10-21 17:31:06 -07:00
TheNetStriker dd424a707b Additional fixes for substream. 
- Replaced deprecated rmdirSync with rmSync.
- Prevent undefined monitor from calling detectorStream.m3u8.
 2024-10-21 12:50:16 +02:00
TheNetStriker 599de35af4 Viewerlist timeout for non substream monitors. 
Fixed zero substream timeout for
 2024-10-16 21:30:01 +02:00
TheNetStriker bd5b6409cd Fixes for substream. 
- Fixed error in destroySubstreamProcess.
Fixed no viewers pushed to viewerList.
- When using "Only When Watching, Use Substream" substreams are now started automatically and the http requests wait's for the output.
- Substream folder is deleted befor new substream starts, so that there can be checked when the s.m3u8 file is created.
- Fixed missing monitorId in FLV and x265 stream path.
 2024-10-16 17:13:01 +02:00
Moe 41d7214a45 get p2pServers without using eval+ 2024-10-10 19:18:20 -07:00
Moe 4f1df193a0 get p2pServers without using eval 2024-10-10 15:11:32 -07:00
Moe 995402e897 fix display of wrong status after monitor returns 2024-10-08 18:20:12 -07:00
Moe 0af9b6c685 move rally page structure to base.js 2024-10-05 12:45:06 -07:00
Moe 3f61686c40 add line stop at config.webBlocksPreloaded.push(`home/rally`) 2024-10-05 12:34:36 -07:00
Moe 558272aecc remove an unnecessary line from notifications/email.js 2024-10-05 12:28:49 -07:00
Moe 31d6fcff10 add config option to change ffbinaries version 2024-10-05 12:22:20 -07:00
Moe e5024248b5 add some logging to s3based upload error 2024-10-05 12:21:46 -07:00
Moe 747cc9875c patch sendCopyOfAllMonitorConfigs function to ignore failure 2024-10-05 12:04:59 -07:00
Moe fb0cfe966a 0.1 Rally Framework 2024-10-04 12:42:57 -07:00
Moe 76b662a139 Fix Dependency Vulnerabilities 
- Telegram Bot module must be installed manually due to vulnerabilities
- FTP Server module must be installed manually due to vulnerabilities
- WebDAV module must be installed manually due to vulnerabilities and conf.json must configured manually to enable it.
- Backblaze B2 module fork latest from git and published under shinobi-backblaze-b2
 2024-09-29 12:57:22 -07:00
Moe 879b5a6bae slice list of object tags too long for videos table column 2024-09-26 11:49:31 -07:00
Moe 659c755875 Plugin Framework Upgrades 2024-09-25 18:42:51 -07:00
Moe 191a45f107 Update matrix.js to work with ES module change in matrix-js-sdk 
(cherry picked from commit 7dcd7d8217)

a0f9a93b Fix/remove broken require line (imported elsewhere)
74231f4d Revert "Fix/remove broken require line (imported elsewhere)"
c0a6a1ed Update matrix.js to work with ES module change in matrix-js-sdk

Co-authored-by: John Doe <overdueexchangefumewarning@proton.me>
 2024-09-19 17:50:55 +00:00
Moe 06450c5e7e Add catch for failed snap on video file 2024-09-18 13:49:32 -07:00
Moe d9653197c3 remove moovatom check 2024-09-16 09:58:38 -07:00
Moe 09df251267 Fix "Use Substream" for Wall Display 2024-09-12 18:42:29 -07:00
Moe 9daa0fa942 Update Plugin Manager downloader 2024-09-11 17:54:30 -07:00
Moe b7cd3b921a make cron do queries through main parentProcess 2024-09-05 18:38:36 -07:00
Moe 6e8d4bf098 auto generate a timelapse frame for completed videos 2024-09-03 18:37:57 -07:00
Moe 0b02762ad8 Add Video Merge Feature in Videos Table 2024-09-03 08:33:47 -07:00
Moe 589874e367 fix dropInEvents file deletion with spaces in filename 2024-09-01 08:29:10 -07:00
Moe eb6106bd6e Undo some ONVIF Scanner Changes 2024-08-28 20:10:10 +00:00
Moe f41fe9ecf6 Bug Fix Bandit 2024-08-22 18:29:10 +00:00
Moe 419927dbd8 Fragrant Foliage 2024-08-09 18:03:36 +00:00
Moe 3d4eee201c Add vitormicillo fix to s.getRawSnapshotFromMonitor 2024-03-22 16:43:51 -07:00
Moe 4972d485c6 update object tracker version and update branding defaults 2024-03-12 13:38:00 -07:00
Moe f32924de3b Merge branch 'shenqihui-dev-patch-27837' into 'dev' 
Update preQueries.js

See merge request Shinobi-Systems/Shinobi!480
 2024-03-11 20:19:24 +00:00
Moe 0ffa9c05a2 Merge branch 'rejectUnauthorized' into 'dev' 
Add rejectUnauthorized support to emailByUser

See merge request Shinobi-Systems/Shinobi!490
 2024-03-11 20:18:36 +00:00
Moe 8af3d4c820 ejs upgrade 3.1.9 
Changes done by @shermdog

commit b0bb0227131eeb54a7b75663338c13b96b76c32a
Author: Moe <github@m03.ca>
Date:   Sun Jan 7 15:26:39 2024 -0800

    add latest dev changes to ejs-upgrade

    commit b45c902cf7
    Author: Moe <github@m03.ca>
    Date:   Sun Jan 7 11:01:59 2024 -0800

        Update install_nodejs.sh

    commit 2f283f6d48
    Author: Moe <github@m03.ca>
    Date:   Sun Jan 7 11:01:53 2024 -0800

        make backblaze errors not return file buffer with error

    commit 5446948880
    Author: Moe <github@m03.ca>
    Date:   Sun Jan 7 11:01:18 2024 -0800

        attempt fixing docker pipeline for arm64v8

    commit 0aa0bb7777
    Author: Moe <github@m03.ca>
    Date:   Fri Jan 5 11:38:54 2024 -0800

        discord bot reconnect when network reconnect

    commit c4749c8c3b
    Author: Moe <github@m03.ca>
    Date:   Tue Jan 2 10:04:58 2024 -0800

        fix syntax error in childUtils.js+

    commit 5fc5d32dff
    Author: Moe <github@m03.ca>
    Date:   Mon Jan 1 10:38:40 2024 -0800

        fix syntax error in childUtils.js

commit 56d1d22499
Merge: 0b6fe3c5 ba80ac8d
Author: Moe <github@m03.ca>
Date:   Mon Jan 1 18:30:31 2024 +0000

    Merge branch 'ejs_upgrade' into 'ejs-upgrade-shermdog'

    ejs upgrade 3.1.9

    See merge request Shinobi-Systems/Shinobi!492

commit ba80ac8d2a
Author: Rick Sherman <rick@shermdog.com>
Date:   Thu Dec 28 15:52:33 2023 -0600

    ejs upgrade 3.1.9
    This commit upgrades ejs to the 3.x series
 2024-02-26 19:16:51 -08:00
Moe 48a0d6be27 Revert "Fix Global Webhook notify request method" 
This reverts commit 8dbc250b5f.
 2024-02-18 09:27:48 -08:00
Moe 8dbc250b5f Fix Global Webhook notify request method 2024-02-16 20:14:07 -08:00
Moe 5a1afab20a add additional tracker functions 
these functions are currently not used in the public build but are included for future official use or custom use cases.
 2024-02-06 10:59:06 -08:00
Moe 1bfa895a80 allow custom footer in discord notify 2024-02-06 10:55:22 -08:00
Moe 3af38b8f60 add more logging to matrix notify plugin 2024-02-06 10:55:12 -08:00
Moe f319be4340 fix jpeg write for ftpServer 2024-02-06 10:54:45 -08:00
Moe 2f283f6d48 make backblaze errors not return file buffer with error 2024-01-07 11:01:53 -08:00
Moe 0aa0bb7777 discord bot reconnect when network reconnect 2024-01-05 11:38:54 -08:00