Commit Graph

1672 Commits (74e75c323140fec3f2760990c2ba22d42e64410c)

Author SHA1 Message Date
Moe 3b4d2d339f Force copy of global lang variable
- to avoid overwriting by user change
2018-12-12 15:53:49 -08:00
Moe c6c4f5d502 Automatic Loading for custom js modules 2018-12-12 15:02:24 -08:00
Moe afdedbeea8 Add some Monitor event Extenders 2018-12-12 14:56:29 -08:00
Moe e13eef5390 Allow merging regions triggers for Built-In Motion+
- update conf.sample.json. New installs will use the merged method for better performance on the client side.
2018-12-08 10:30:47 -08:00
Moe f2a014a7c3 Allow merging regions triggers for Built-In Motion
- add `"detectorMergePamRegionTriggers":true` to your conf.json for it to take affect.
- using this can break any Detector Filters that rely on the region name for trigger. If using `equal to` please change to `contains`.
2018-12-08 10:28:38 -08:00
Moe a548a03845 fix Dashcam/Streamer (missing basic.js) 2018-12-04 08:48:40 -08:00
Moe 96c6d1de19 Add robots.txt 2018-12-04 08:34:59 -08:00
Moe c91ce87ec7 Additional Extenders 2018-12-04 08:34:43 -08:00
Piotr Kantyka ffc20b393a command killing ffmpeg simplified 2018-11-29 09:44:47 +01:00
Moe 23ab10d906 simplify capture method for s.createEventBasedRecording (Traditional Recording) 2018-11-28 10:43:28 -08:00
Moe 3301972884 Merge branch 'dev' into 'master'
Tiny Fixes

See merge request Shinobi-Systems/Shinobi!41
2018-11-28 15:32:07 +00:00
Moe a380ba7d2c Check for static ffmpeg before system ffmpeg 2018-11-28 07:14:12 -08:00
Moe e31e8ef332 Fix Timeout Reset for Traditional Recording 2018-11-28 07:13:55 -08:00
Moe ee29c12c2e Fix videoSnap reference bug
+ add some extenders
2018-11-22 07:47:43 -08:00
Moe 3c01267e5b Merge branch 'dev' into 'master'
Solar Plexus

See merge request Shinobi-Systems/Shinobi!38
2018-11-17 18:34:07 +00:00
Moe ea1142e779 add ImageMagick to yolo plugin again
- apparently not removed yet.
2018-11-16 18:47:52 -08:00
Moe 5efcbb7a8f Update yolo plugin to 2.0.0
Imagemagick is not longer need. OpenCV is now a dependency instead.
2018-11-16 15:49:24 -08:00
Moe 57cf4f780a Update pluginBase 2018-11-16 15:48:09 -08:00
Moe caa0079e15 Force Websocket connection for pluginBase 2018-11-16 10:50:40 -08:00
Moe 950dd9bf37 Make Built-In Motion Detector Matrix optional 2018-11-15 10:29:23 -08:00
Moe 219fdd1139 Fix 2-Factor Authentication 2018-11-14 19:24:50 -08:00
Moe 5f4f580c41 API call for getting Monitor State Presets 2018-11-14 19:24:34 -08:00
Moe e5d0cfd33b Merge branch 'dev' into 'master'
Kicking Kangaroo

See merge request Shinobi-Systems/Shinobi!37
2018-11-11 04:11:34 +00:00
Moe a0ec9afc87 Allow Mass Config Changes by API (monitorStates) and more
- Unlike /configureMonitor/ this method, /monitorSates/, can take single veriables for a monitor edit.
+ clean /configureMonitor/'s addEdit portion and make it a separate function
+ add "raw" catch. if "raw" not found another database init will be requested
+ fix "undefined" monitor status for Disabled monitors on Shinobi start
+ fix color threshold save for region editor
+add fallback for snapBuffer failure
2018-11-10 19:59:02 -08:00
Moe eb65330fa8 pathing fixes for streams 2018-11-06 10:44:01 -08:00
Moe 2ccd8bb786 fix jpeg mode url 2018-11-06 10:09:53 -08:00
Moe 3a2c95e0f3 fix failed login page redirect 2018-11-06 10:09:38 -08:00
Moe a6575bc4f7 change default super and admin prefixes 2018-11-06 08:25:00 -08:00
Moe 89a057a62a fix front end lib pathing when using custom webPaths 2018-11-05 20:27:19 -08:00
Moe c25272d5ef Merge branch 'dev' into 'master'
Yellow Turtle - Performance and Stability Patches

See merge request Shinobi-Systems/Shinobi!36
2018-11-06 04:18:59 +00:00
Moe e1b593298a fix var name type for config.cloudUploaders 2018-11-05 13:07:50 -08:00
Moe 29589750e9 Show basic bounding box for Built-In Motion Detector
- make pam-diff static to accomodate additions without creating a new npm repo. Thanks Kevin Godell for the amazing detection engine!
- Learn more about the original pam-diff by Kevin here : https://github.com/kevinGodell/pam-diff
2018-11-05 12:58:05 -08:00
Moe 4c0cf2b3a3 fix cron.js SQLite-deleteOld bug
+ make cron video deletes happen in bulk rather than 1 query per video
+ clear eventBaseRecording timeout to avoid fallback action after success
+make non-python yolo show object detection section, remove python-yolo
2018-11-05 12:55:58 -08:00
Moe ca3619c1a8 opencv plugin no longer using cascades folder
- opencv4nodejs provides compatible cascades and those are the only ones provided and usable now.
- put face-recognition plugin back to 0.9.3 for compatibility
- fix syntax for extender
2018-11-03 19:16:54 -07:00
Moe fef3ca8eb7 face-recognition-cuda 0.9.3 to 0.9.3a for CUDA 10
+ updated opencv plugin for refactor but forgot to mention in last commit
2018-11-03 16:02:45 -07:00
Moe 1727f2c5e7 add catch for video file range read on get 2018-11-03 10:40:41 -07:00
Moe 70339bd0d4 block framewrite to ram if detector is off
- applies only when using "connectionType":"ram" in plugin conf.json
2018-11-03 00:16:16 -07:00
Moe efdf1b7c1a make pluginBase find first available port for web port 2018-11-02 23:54:38 -07:00
Moe 8e51afefbd Blue Turtle - Refactor Plugin Architecture
+ YoloV3 Plugin updated
+ OpenALPR Plugin updated
+ Dlib Plugin updated
- These plugins were updated because they are capable of at least 5fps to 10fps in detection speed with an NVIDIA GPU
- pluginBase.js is now included with all the basic functions to start a plugin for Shinobi
- Only modified detector functions are placed inside each plugin's initiator script.
2018-11-02 23:38:23 -07:00
Moe f3d60ca674 Additions and Cleanup
+ Allow global designation for Backblaze B2, Amazon S3, and WebDAV
+ allow frame transfer to plugin by "File in RAM" (experimental and currently only works with yolo and dlib)
+ API method for account save/edit
+ Add C++ based Dlib plugin (face-recognition)
+ allow choosing tiny or regular weights for yolo
- remove old python-dlib plugin because it is just bad (yucky python)
2018-11-02 16:44:53 -07:00
Moe 74e8729cdc simplify snapshot icon and remove extra logs 2018-10-31 16:21:13 -07:00
Moe 4304fa9a47 Merge branch 'dev' into 'master'
Blue Turtle - Minor Additions and Bug Fixes

See merge request Shinobi-Systems/Shinobi!35
2018-10-29 16:02:01 +00:00
Moe 32aa29acdc Update plugins/yolo/INSTALL.sh 2018-10-28 19:09:18 -07:00
Moe c87521ec0d Fix ffmpeg "undefined" bug
+ silence freebsd error
2018-10-28 15:28:22 -07:00
Moe d0398670a4 Update libs/webServerPaths.js 2018-10-27 10:36:20 -07:00
Moe e67c819954 Update libs/webServerAdminPaths.js 2018-10-27 10:36:15 -07:00
Moe 513e484c07 Traditional Recording with dynamic recording timeout
- "Timeout Reset on Next Event" is now an available in the Global Detector Settings section for Traditional recording method
2018-10-27 10:36:06 -07:00
Moe f5e405002c Merge branch 'dev' into 'master'
Blue Turtle : The Refactoring

See merge request Shinobi-Systems/Shinobi!31
2018-10-25 04:39:32 +00:00
Moe b5132dd279 Cleanup for Super and Admin panel user management functions+ 2018-10-24 17:00:45 -07:00
Moe 2edb408702 Cleanup for Super and Admin panel user management functions
+ added sample JSONs for docs and test scripts
2018-10-24 16:41:02 -07:00