Commit Graph

371 Commits (91f530c4615984b93e50bbf5326800505e66ccb4)

Author SHA1 Message Date
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
Moe 235c6760a5 add "make" to centos and ubuntu installers 2018-07-23 08:49:49 -07:00
Moe 20c5cbefc7 disallow coProcessor when input maps are present 2018-07-18 14:09:29 -07:00
Moe f31888cbb4 fix scrollbar issue when using small monitor items 2018-07-17 19:24:52 -07:00
Moe 117918a4ac update internal setting suggestion in monedit.ejs 2018-07-17 19:24:14 -07:00
Moe 26a44b6e40 Allow custom from email
A redoing of Helvio's MR https://gitlab.com/Shinobi-Systems/Shinobi/merge_requests/16

it was redone to make it appear in the same coding style. Thanks Helvio!
2018-07-16 10:21:14 -07:00
Moe 7a84e087ff fix event mail send function 2018-07-16 09:59:52 -07:00
Moe f2fcf8e034 Allow deleting files from filesystem when deleting monitor 2018-07-15 21:57:06 -07:00
Moe a5cd625f4f creating multiple confirm options for Confirm window 2018-07-15 21:56:13 -07:00
Moe 4bc6a9bb3c add permission check and failed response for monitor delete 2018-07-15 19:52:44 -07:00
Moe 9dd8c2caf0 allow passing region_name and snap_path in detector_webhook and detector_command 2018-07-15 15:44:51 -07:00
Moe 9c93c7c777 fix createPamDiffEngine and show region name the in motion meter 2018-07-15 15:15:32 -07:00
Moe fe89c9f5ab iStreamer check fix and hide Automatic Connection options for Streamer type 2018-07-15 14:41:14 -07:00
Moe 989c4984a4 disable accelerator when Streamer type monitors are used 2018-07-15 14:27:01 -07:00
Moe b8c8f4bb3f more coProcessor logs and cleanup 2018-07-15 14:10:22 -07:00
Moe c6ee3ea8b0 fix crashing coProcess with no outputs 2018-07-15 13:05:11 -07:00
Moe 05b6573e1e status changing lang vars for notifications 2018-07-15 12:25:15 -07:00
Moe 62a9a74099 hide stream timestamp and watermark sections with copy method 2018-07-15 12:24:55 -07:00
Moe a900eef2c8 display hidden fields for mjpeg stream 2018-07-15 12:21:29 -07:00
Moe 07086ff6c2 fix incorrect var name for detector_mail_send_video 2018-07-15 11:59:37 -07:00
Moe ca5fcd3e63 cleanup coProcessor launch and close 2018-07-15 11:59:14 -07:00
Moe 84073bd554 add missing checkLog 2018-07-12 23:18:29 -07:00
Moe 946eba0618 quieter coProcessor logs 2018-07-12 23:11:40 -07:00
Moe 2a58f4405c update package.json, remove extra log, increase start delay for coProcessor 2018-07-12 23:01:03 -07:00
Moe f52a725c0e critical bug fixes : coProcessor spawns, log filter
- Fix non-gracefully closing coProcessors
- add error handler on Mp4Frag
- speedup ffmpeg log filter
2018-07-12 22:57:48 -07:00
Moe 950fc7c8c1 Option to attach video on event (Discord and Email) 2018-07-12 11:27:15 -07:00
Moe 70500dca7a Allow JPEG API (and other JPEG based outputs) with CUDA with coProcessor
- a second FFmpeg process is launched to create the JPEG and PAM data.
- currently stream channels are not offloaded
2018-07-11 23:47:43 -07:00
Moe b6c8364e16 update configuration editor with addToConfig option.
passing addToConfig parameter allows you to define a complete JSON to merge instead of adding each variable as its own parameter.
2018-07-11 14:09:04 -07:00
Moe 80260b0798 Merge branch 'dev' into 'master'
fix syntax for video email attachment on event

See merge request Shinobi-Systems/Shinobi!15
2018-07-11 19:15:32 +00:00
Moe 7c35dfa6f6 Merge branch 'dev' into 'master'
Shiny Pikachu

See merge request Shinobi-Systems/Shinobi!14
2018-07-11 02:38:47 +00:00
Moe 7f9aa5b705 fix syntax for video email attachment on event 2018-07-09 13:02:26 -07:00
Moe cb83daeab8 Discord bot as account option instead of system configuration
- each "admin" account can login their own discord bot for notifications
2018-07-09 11:29:20 -07:00
Moe 939c0d4e5e Event on Trigger gets Discord notifications and video clip attachments
- Traditional Recording must be enabled to get a video clip and JPEG API must be enabled to get a JPEG snapshot (for now)
- Email also gets the attachments
2018-07-08 23:32:52 -07:00
Moe 21c8bc47d6 syntax fix for kill allowStdinWrite 2018-07-08 09:38:22 -07:00
Moe 52b79e14b3 firefox live view in power video viewer fix 2018-07-07 20:59:16 -07:00
Moe 92ed6fd819 remove some whitespace 2018-07-07 19:56:36 -07:00
Moe caddbfc4f5 Monitor stream audio toggle (video element) added to menu 2018-07-07 19:56:18 -07:00
Moe c5a49a005e embed video element stretch image 2018-07-07 19:17:10 -07:00
Moe bd7d84306d Option to Restrict Sub-Account viewing logs 2018-07-07 16:06:16 -07:00
Moe 1fad2f319f Option to Restrict Sub-Account changing their user settings 2018-07-07 16:00:23 -07:00