Commit Graph

3260 Commits (ffb511bd153592caffaaca99514e66181584cf2e)

Author SHA1 Message Date
Moe eb0796ca1a use request() for webhook on event 2018-08-12 17:44:12 -07:00
Moe b7c628fe2d fix factorAuth screen selection
- bug would cause factorAuth login to always login to dashboard
2018-08-12 14:22:26 -07:00
Moe 19a14c237c check for available group 2018-08-12 11:07:29 -07:00
Moe adb07b403b 2-Factor Authentication can use Discord 2018-08-12 11:06:56 -07:00
Moe 68346a4777 update COPYING file to md 2018-08-11 12:00:39 -07:00
Moe be7b9e2609 remove old child plugin 2018-08-11 11:58:38 -07:00
Moe c7ebf6cee6 update installers to have audit function
this should automatically clear vulnerabilities on fresh installs.
2018-08-11 11:58:15 -07:00
Moe b91f64c0fc update Python-Yolo plugin to use socket.io instead of http for detections
much faster now :D
2018-08-11 11:54:41 -07:00
Moe 6ec0367202 Merge branch 'patch-1' into 'dev'
Update LICENSE.md

See merge request Shinobi-Systems/Shinobi!18
2018-08-10 23:20:53 +00:00
Moe 8f5e6a88c7 Open All function do reconnect if monitor already open 2018-08-09 14:44:37 -07:00
Moe 6c198b07e0 no stream_loop flag for anything other than mp4 and local inputs 2018-08-09 13:17:30 -07:00
Moe 77271dd4e7 Monitor Popout on Event option+ 2018-08-09 08:50:47 -07:00
Moe 160ee3c21c Monitor Popout on Event option 2018-08-09 08:46:04 -07:00
Moe 267a880a83 show possible values for detector filters 2018-08-09 08:26:34 -07:00
Moe 429c2fe64b allow motion events to skip the filter 2018-08-08 21:52:10 -07:00
Moe f2313f5ba3 Allow different fps, height, and width when using "Check for Motion First" with "Built-In" 2018-08-08 21:40:34 -07:00
Moe b9e57f9364 minor bug fixes 2018-08-08 19:59:32 -07:00
Moe 3639b7b622 Detector Plugin Filtering Engine 0.1 2018-08-07 21:07:19 -07:00
Moe 971099aacd python-yolo : aditional notices and commands to update pip(3) 2018-08-05 20:39:42 -07:00
Moe 16961d40e4 add missing install dependencies
- force darknet to try install every run instead of check for existence
2018-08-05 20:24:50 -07:00
Moe 702f6b3018 correct readme paths for python-yolo 2018-08-05 19:26:13 -07:00
Moe 4944905108 readme for python-yolo 2018-08-05 19:24:30 -07:00
Moe 1148deca5d python-yolo plugin installer 2018-08-05 19:20:12 -07:00
Moe 482939bc08 Python Yolov3 Detection Plugin 2018-08-05 17:44:24 -07:00
Moe 4a0c34ba7c vaapi ignores coProcessor flags 2018-08-05 14:48:36 -07:00
Moe e60f25e33b baseURL for frontend JS (main.dash2.js) 2018-08-02 22:58:55 -07:00
Moe 971ecc513a Preparation for ONVIF Events (Profile T cameras only) 2018-08-02 22:58:28 -07:00
Moe 03c8ae8810 fix menu lanucher appearance when username too long 2018-08-02 12:39:39 -07:00
David MARTIN a8b389d890 Update LICENSE.md 2018-07-30 09:28:02 +00:00
Moe f2c72a8ebd Merge branch 'dev' into 'master'
Tarkalian Tea

See merge request Shinobi-Systems/Shinobi!17
2018-07-28 17:26:00 +00:00
Moe b68e515bab Merge branch 'catch_SIGINT' into 'dev'
catch SIGINT so we can Ctrl+C to close camera.js on the terminal

See merge request Shinobi-Systems/Shinobi!10
2018-07-26 06:52:01 +00:00
Moe 1f6169ccb1 Merge branch 'dev' into 'dev'
Update Indifference definition

See merge request Shinobi-Systems/Shinobi!4
2018-07-26 06:51:30 +00:00
Moe 00f5dc0ff8 Merge branch 'small_license_fixes' into 'dev'
Small license fixes

See merge request Shinobi-Systems/Shinobi!11
2018-07-26 06:49:21 +00:00
Moe 6a0f83a1eb fix webPaths.home and ad webPaths.apiPrefix
webPaths.apiPrefix may not be accomodated for in the provided dashboards. Use this options only if you are only using Shinobi's core.
2018-07-25 23:24:46 -07:00
Moe 6c9e978daf fix openalpr readme 2018-07-25 17:51:13 -07:00
Moe 8f6c3541da auto remove special characters on admin creation 2018-07-25 13:51:51 -07:00
Moe 7a5d99ea92 add fa-caret to show the username is a menu button 2018-07-24 23:54:20 -07:00
Moe 6170ee5179 Add Blazing Blue theme
- Blaze Blue was made to test how the current Superuser skin would look on the v2 of the dashboard with Bootstrap 3.
2018-07-24 23:47:46 -07:00
Moe 1a58a87df2 fix Cloud Videos row insertion 2018-07-24 22:42:55 -07:00
Moe 8d3cb242c8 remove incorrect placeholder for "Save Directory" in Amazon S3 section 2018-07-24 22:27:13 -07:00
Moe fab0839cd2 Minor bug fixes and additional table for "Cloud Videos"
- fixed Superuser editing a user caused user settings to be destroyed
- added Cloud Videos table for Amazon S3 and future Cloud Based Storage
- Added error handler for Discord message bot
2018-07-24 22:24:14 -07:00
Moe 6b528cd291 fix blank variable pass to config.baseURL 2018-07-24 12:34:21 -07:00
Moe 5b29ee1955 skip over "null" detector region objects
- additional cleanup
- set default config.baseURL to "" (will work like before "baseURL")
2018-07-24 10:55:31 -07:00
Moe c1861885b3 add aws-sdk to package.json 2018-07-24 10:43:58 -07:00
Moe 1b141bb3c3 remove extra amazon s3 log and log error only 2018-07-23 22:51:23 -07:00
Moe 013873c6f7 fix amazon s3 (aws) cleanup on user settings update 2018-07-23 22:44:44 -07:00
Moe 2bd790545b Amazon S3 upload on video complete
- Open "Settings" in the "Admin" account (sub-account creator) to reveal your Amazon S3 configuration fields.
2018-07-23 22:33:06 -07:00
Moe 4c7a664f90 move path ending check 2018-07-23 22:06:35 -07:00
Moe dc6d65d0a9 some additional whitespace for human readability 2018-07-23 12:01:37 -07:00
Moe 911966ac17 Force full URL for libraries and allow custom base URL
- `baseURL` can now be used in conf.json to specify a custom origin.
2018-07-23 11:53:35 -07:00