1f6169ccb1
Merge branch 'dev' into 'dev'
...
Update Indifference definition
See merge request Shinobi-Systems/Shinobi!4
2018-07-26 06:51:30 +00:00
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
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
6c9e978daf
fix openalpr readme
2018-07-25 17:51:13 -07:00
8f6c3541da
auto remove special characters on admin creation
2018-07-25 13:51:51 -07:00
7a5d99ea92
add fa-caret to show the username is a menu button
2018-07-24 23:54:20 -07:00
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
1a58a87df2
fix Cloud Videos row insertion
2018-07-24 22:42:55 -07:00
8d3cb242c8
remove incorrect placeholder for "Save Directory" in Amazon S3 section
2018-07-24 22:27:13 -07:00
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
6b528cd291
fix blank variable pass to config.baseURL
2018-07-24 12:34:21 -07:00
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
c1861885b3
add aws-sdk to package.json
2018-07-24 10:43:58 -07:00
1b141bb3c3
remove extra amazon s3 log and log error only
2018-07-23 22:51:23 -07:00
013873c6f7
fix amazon s3 (aws) cleanup on user settings update
2018-07-23 22:44:44 -07:00
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
4c7a664f90
move path ending check
2018-07-23 22:06:35 -07:00
dc6d65d0a9
some additional whitespace for human readability
2018-07-23 12:01:37 -07:00
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
235c6760a5
add "make" to centos and ubuntu installers
2018-07-23 08:49:49 -07:00
20c5cbefc7
disallow coProcessor when input maps are present
2018-07-18 14:09:29 -07:00
f31888cbb4
fix scrollbar issue when using small monitor items
2018-07-17 19:24:52 -07:00
117918a4ac
update internal setting suggestion in monedit.ejs
2018-07-17 19:24:14 -07:00
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
7a84e087ff
fix event mail send function
2018-07-16 09:59:52 -07:00
f2fcf8e034
Allow deleting files from filesystem when deleting monitor
2018-07-15 21:57:06 -07:00
a5cd625f4f
creating multiple confirm options for Confirm window
2018-07-15 21:56:13 -07:00
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
Moe