4bc6a9bb3c
add permission check and failed response for monitor delete
2018-07-15 19:52:44 -07:00
9dd8c2caf0
allow passing region_name and snap_path in detector_webhook and detector_command
2018-07-15 15:44:51 -07:00
9c93c7c777
fix createPamDiffEngine and show region name the in motion meter
2018-07-15 15:15:32 -07:00
fe89c9f5ab
iStreamer check fix and hide Automatic Connection options for Streamer type
2018-07-15 14:41:14 -07:00
989c4984a4
disable accelerator when Streamer type monitors are used
2018-07-15 14:27:01 -07:00
b8c8f4bb3f
more coProcessor logs and cleanup
2018-07-15 14:10:22 -07:00
c6ee3ea8b0
fix crashing coProcess with no outputs
2018-07-15 13:05:11 -07:00
05b6573e1e
status changing lang vars for notifications
2018-07-15 12:25:15 -07:00
62a9a74099
hide stream timestamp and watermark sections with copy method
2018-07-15 12:24:55 -07:00
a900eef2c8
display hidden fields for mjpeg stream
2018-07-15 12:21:29 -07:00
07086ff6c2
fix incorrect var name for detector_mail_send_video
2018-07-15 11:59:37 -07:00
ca5fcd3e63
cleanup coProcessor launch and close
2018-07-15 11:59:14 -07:00
84073bd554
add missing checkLog
2018-07-12 23:18:29 -07:00
946eba0618
quieter coProcessor logs
2018-07-12 23:11:40 -07:00
2a58f4405c
update package.json, remove extra log, increase start delay for coProcessor
2018-07-12 23:01:03 -07:00
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
950fc7c8c1
Option to attach video on event (Discord and Email)
2018-07-12 11:27:15 -07:00
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
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
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
7c35dfa6f6
Merge branch 'dev' into 'master'
...
Shiny Pikachu
See merge request Shinobi-Systems/Shinobi!14
2018-07-11 02:38:47 +00:00
7f9aa5b705
fix syntax for video email attachment on event
2018-07-09 13:02:26 -07:00
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
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
21c8bc47d6
syntax fix for kill allowStdinWrite
2018-07-08 09:38:22 -07:00
52b79e14b3
firefox live view in power video viewer fix
2018-07-07 20:59:16 -07:00
92ed6fd819
remove some whitespace
2018-07-07 19:56:36 -07:00
caddbfc4f5
Monitor stream audio toggle (video element) added to menu
2018-07-07 19:56:18 -07:00
c5a49a005e
embed video element stretch image
2018-07-07 19:17:10 -07:00
bd7d84306d
Option to Restrict Sub-Account viewing logs
2018-07-07 16:06:16 -07:00
1fad2f319f
Option to Restrict Sub-Account changing their user settings
2018-07-07 16:00:23 -07:00
14c0d58b5c
client side permission checks updated to hide elements
2018-07-07 14:38:27 -07:00
4e4902b32f
Restrict Monitor Addition and Deletion
...
- cleanup admin.ejs
2018-07-07 14:29:47 -07:00
0fc33342a3
clear API keys on user update from admin
...
- additional checks for API access
2018-07-07 14:24:43 -07:00
a6cd2f412e
remove extra console log on zip
2018-07-07 10:58:46 -07:00
7cf57e20bb
minor cleanup
2018-07-07 10:42:37 -07:00
4f5da4ad7a
allow multiple zip and download of videos
...
- and cleanup in main.dash2.js
2018-07-07 10:41:09 -07:00
08a80f2b7e
sql time query cleanup
2018-07-07 10:33:23 -07:00
7c26fa1f87
little tweaks for typographical and formatting consistency
2018-07-06 00:21:24 +09:00
0372337e09
catch SIGINT so we can Ctrl+C to close camera.js on the terminal
2018-07-05 18:34:01 +09:00
85b75aca76
Merge remote-tracking branch 'upstream/dev' into developer_documentation
2018-07-05 16:10:45 +09:00
da28d1448f
add intial developer documenatation
2018-07-05 16:10:32 +09:00
0b0468652e
Merge branch 'dev' into 'master'
...
Gift of the Sages
See merge request Shinobi-Systems/Shinobi!7
2018-07-04 17:08:45 +00:00
18460a5e25
re-add changes removed from license
...
https://gitlab.com/Shinobi-Systems/Shinobi/merge_requests/5 was merged from a fork of master, which did not have the latest changes.
2018-07-04 10:04:47 -07:00
adebd13c14
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2018-07-04 09:56:19 -07:00
2f5d36c6f4
Updated License to match #2
...
@Kagetsuki provided a suggest list of changes in Issue #2
https://gitlab.com/Shinobi-Systems/Shinobi/issues/2
2018-07-04 09:56:05 -07:00
fa27a9dd1f
Merge branch 'revert-4928c5b0' into 'master'
...
Revert "Merge branch 'license_to_md' into 'master'"
See merge request Shinobi-Systems/Shinobi!8
2018-07-04 16:29:21 +00:00
b62540dee2
Revert "Merge branch 'license_to_md' into 'master'"
...
This reverts merge request !5
2018-07-04 16:28:27 +00:00
dbd4a88207
Merge branch 'templates' into 'dev'
...
add Feature requeest template
See merge request Shinobi-Systems/Shinobi!6
2018-07-04 16:26:33 +00:00
4928c5b084
Merge branch 'license_to_md' into 'master'
...
convert LICENSE to MD format, add ,swo and .swp to gitignore
See merge request Shinobi-Systems/Shinobi!5
2018-07-04 16:24:42 +00:00
Moe
zero