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

1474 Commits (40798fc68baa0dd9968e66bb9a5418168f88619d)

Author SHA1 Message Date
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
Moe 649ed30fd2 update embed page write 2022-10-21 22:33:12 -07:00
Moe 3c7289db0b Revert "Update amazonS3.js" 
This reverts commit 1f80727362.
 2022-10-20 15:34:23 -07:00
Moe 1f80727362 Update amazonS3.js 2022-10-19 17:00:23 -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 b54d08ad36 add two more options to mqttOut trigger 
+ insertCompletedVideoExtender
+ onEventBasedRecordingComplete
 2022-10-11 20:20:04 -07:00
Moe d97cc5b367 Add onEventBasedRecordingComplete extender 2022-10-11 20:14:59 -07:00
Moe 049beaceb5 Fix customAutoLoad loading pageBlocks 2022-10-11 20:14:33 -07:00
Moe 10bfce9563 Make Plugin Manager use conf.json for "Enabled" status 2022-10-08 18:49:31 -07:00
Moe 3a7d30e362 mild refactor for embed live stream feature 2022-10-08 16:28:12 -07:00
Moe be973aaa7b disable monitor auto restart on error if manually already restarted+ 2022-10-02 20:26:47 -07:00
Moe 190d76bec1 Fix syntax bug in libs/control/ptz.js 2022-10-02 20:26:35 -07:00
Moe 5f3bf0df6e disable monitor auto restart on error if manually already restarted 2022-10-02 20:13:22 -07:00
Moe 1321e8cfca Show Completed Slicing after completion 2022-10-01 12:54:43 -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 48d7d6a99b Upgrade permission check function 
fixes videos appearing in Videos Table but cannot be played.
 2022-09-28 13:39:25 -07:00
Moe de18962860 add Fatal Error Exit notice, clean up fatal_max error check+ 2022-09-27 14:11:15 -07:00
Moe 70ea243cba clean up fatal_max error check 2022-09-27 13:53:02 -07:00
Moe 4edcf74c48 add delete button to fileBin table 2022-09-25 19:46:20 -07:00
Moe 9ce24bfd3c Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-09-24 14:23:55 -07:00
Moe 76f244d958 fix formData build for fetch 2022-09-24 14:23:47 -07:00
Moe b992e536ba minor cleanup 2022-09-24 14:19:25 -07:00
Moe 292055a9a3 Update Backblaze Videos to download proxied 2022-09-24 14:11:04 -07:00
Moe 642e06b9e7 Merge branch 'nocona-fix-event-based-recording' into 'dev' 
Fix Event Based Recording Stutter for some cameras

See merge request Shinobi-Systems/Shinobi!390
 2022-09-24 02:58:00 +00:00
Moe ddc3fa3796 add log filters for monitor log 2022-09-18 14:38:47 -07:00
Moe 9661f019d0 adjust raw snapshot from detectorStream.m3u8 2022-09-14 19:21:45 -07:00
Moe efe703dfc0 fix #410 2022-09-14 15:35:10 -07:00
Moe abbb94899c remove loadGroupApps from login 2022-09-14 10:00:38 -07:00
Moe 6cf4e332f9 add more specific catches for certain fatal errors 2022-09-12 19:56:25 -07:00
Katie Roberts 9fb1a602eb Update libs/events/utils.js 2022-09-12 23:42:05 +00:00
Katie Roberts 5d727f0ac0 Update libs/ffmpeg/builders.js 2022-09-12 23:36:24 +00:00
Katie Roberts 2ff97d301d Update libs/basic/utils.js 2022-09-12 23:33:15 +00:00
Katie Roberts b13297bdfb Update libs/ffmpeg/builders.js 2022-09-12 23:29:56 +00:00
Katie Roberts b2981e2500 Update libs/events/utils.js 2022-09-12 23:28:08 +00:00
Katie Roberts def2224544 Update libs/basic/utils.js 2022-09-12 23:23:56 +00:00
Katie Roberts 15fa2e8446 Update libs/events/utils.js 2022-09-12 00:00:08 +00:00
Katie Roberts 8263aa0e8a Update libs/events/utils.js 2022-09-11 23:45:17 +00:00
Katie Roberts b387fc0042 Update libs/ffmpeg/builders.js 2022-09-11 23:36:05 +00:00
Katie Roberts ce224b4a1a Update libs/ffmpeg/builders.js 2022-09-11 23:22:12 +00:00
Katie Roberts 2388b31fd6 Update libs/ffmpeg/builders.js 2022-09-11 23:15:14 +00:00
Katie Roberts 38d8b66e9a Update libs/events/utils.js 2022-09-11 23:13:41 +00:00
Katie Roberts c012a85856 Update libs/ffmpeg/builders.js 2022-09-11 23:12:55 +00:00
Katie Roberts f6adf7738b Update libs/events/utils.js 2022-09-11 23:10:48 +00:00
Katie Roberts ee5a1aee1c Update libs/basic/utils.js 2022-09-11 22:59:28 +00:00
Katie Roberts 91503ff9c5 Update libs/ffmpeg/builders.js 2022-09-11 22:53:54 +00:00
Moe be016dee2a add roundNearest5 to basic/utils.js 2022-09-11 15:52:13 -07:00
Katie Roberts 4cbdbfafe1 Update libs/events/utils.js 2022-09-11 21:33:51 +00:00
Katie Roberts 60cddb11fa Update libs/events/utils.js 2022-09-11 21:29:18 +00:00
Katie Roberts 0e0eb4ab46 Update libs/events/utils.js 2022-09-11 21:23:39 +00:00
Katie Roberts 777d56bc3c Update libs/ffmpeg/builders.js, libs/events/utils.js 2022-09-11 04:13:49 +00:00
Moe 8f90e4c2dd Remove X-Powered-By in response header #408 2022-09-05 09:03:29 -07:00
Moe 178762c6d1 update permission check for ke/mid queries 2022-08-31 12:21:38 -07:00
Moe b3a27f43e3 minor adjustment to onvif events init 2022-08-31 12:20:24 -07:00
Moe 0a11b5e680 Fix Streamer and Dashcam pages 2022-08-30 09:50:05 -07:00
Moe 519ab851e8 fix customAutoLoad front end library loader 2022-08-25 13:09:48 -07:00
Moe a3048679b7 Fix #396 (MQTT Configuration Broken) 
Changes suggested in https://gitlab.com/Shinobi-Systems/Shinobi/-/issues/396#note_1046194795
 2022-08-22 10:37:21 -07:00
Moe 80f333ec81 fix missing column in Videos table 2022-08-21 11:16:16 -07:00
Moe 4a1817b421 Merge branch 'unused-file-cleanup' into 'dev' 
Web UI Library Cleanup

See merge request Shinobi-Systems/Shinobi!378
 2022-08-21 15:52:10 +00:00
Moe f6e3b24a4d update some archive preQueries 2022-08-20 14:54:33 -07:00
Moe d840de2736 fix broken Monitors query 2022-08-20 14:52:52 -07:00
Moe 6908a3a757 Merge branch 'archive-videos' into 'dev' 
Archive Feature

See merge request Shinobi-Systems/Shinobi!379
 2022-08-20 18:00:22 +00:00
Moe 1bff50199b Allow viewing only Archived videos in Videos page 2022-08-20 10:50:08 -07:00
Moe ff3eaf8a09 Alter Event Filter execution 2022-08-20 10:29:35 -07:00
Moe 7442214efe Add Button for FileBin file archival 2022-08-20 10:28:55 -07:00
Moe 8eb0326e5d Add API Call to Delete and Archive FileBin files 2022-08-19 23:37:40 -07:00
Moe 16075f3d2e Make cron.js ignore archived data 2022-08-19 23:17:44 -07:00