ccf90f67f8
add RTSP Transport to monitorSnapShot command
2019-10-01 13:53:20 -07:00
b946588ee6
fix cpu indicator for cluster mode
2019-09-26 12:21:45 -07:00
7a1ff82b5b
delete all instances of monitor from other childNode servers on start
2019-09-26 12:18:44 -07:00
0db090c093
clear stale cameras from childNode activeCamera list
2019-09-25 15:33:03 -07:00
c777f85475
add !dead condition for childNode selector
...
+ make getChildNodes response cleaner
2019-09-24 20:45:43 -07:00
5a667d9cf2
make childNode disconnet sync monitor restarts (like on startup)
2019-09-24 19:11:48 -07:00
6f3651e955
add 2 second wait per camera on startup (sync)
2019-09-24 15:47:18 -07:00
e5d8b9caa4
fix childNode camera count load balancer
2019-09-24 14:16:03 -07:00
e7481c1316
fix childNode cpu emit, fix monitor cleanup on disconnect (max stack bug)
2019-09-24 13:56:33 -07:00
e362639a9a
fix childNode ghost processes from disconnect
2019-09-24 11:54:01 -07:00
1fe85465b4
fix childNode failure to restart processes after disconnect
2019-09-24 11:35:37 -07:00
a2dcccd9b9
fix monitor import base object
...
+ add copy stream channels
2019-09-23 15:58:33 -07:00
4a1789ae89
add m3u8 import capability to multimon+
...
- make it compatible with older buffer types
2019-09-23 15:08:06 -07:00
8980a65805
add m3u8 import capability to multimon
2019-09-23 12:09:04 -07:00
bcbb6e8083
add missing lang passage
2019-09-21 13:49:02 -07:00
07ed549f99
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2019-09-10 12:24:05 -07:00
7c275f3e6b
fix recording folder syntax
...
- wow big dumb
2019-09-10 12:23:56 -07:00
24ba7ed7fa
Merge branch 'multi-trig' into 'dev'
...
Corrected var check for multi trigger setting.
Initial check had the incorrect variable (`detector_multi_trigger`) for checking the monitor settings.
Monitor settings and all other references use `det_multi_trig`
This change fixes the check to look for `det_multi_trig` now.
See merge request Shinobi-Systems/Shinobi!116
2019-09-08 21:47:55 +00:00
8f5621fa18
Corrected var check for multi trigger setting.
2019-09-08 21:28:25 +00:00
42dd6a5544
fix stream folder creation
2019-09-07 23:56:59 -07:00
276773bc61
add frame minimum (30 frames) to timelapse mp4 builder
2019-09-07 23:19:21 -07:00
0b9a6d03d4
fix timelapse pointer
2019-09-07 23:18:53 -07:00
ac6cd26bcc
more async functions
2019-09-07 23:17:57 -07:00
cd18f64792
Update dropInEvents.js
2019-09-07 13:35:03 -07:00
5524b113e1
make dropInEvent server async functions onMonitorInit
...
+ make folder error handler a global function
2019-09-07 12:49:02 -07:00
edbdcad7b6
clean up some object detector ffmpeg strings
2019-09-06 20:41:24 -07:00
4e8cdb4876
make camera folder creation sync functions as async
2019-09-06 20:41:09 -07:00
3fa689ce1d
remove $.ajax and use regular XHR in downloadAndZip
2019-09-06 17:28:54 -07:00
5c80cb4938
fix Content-Type for video file stream
2019-09-06 17:02:17 -07:00
085b6df7d9
fix Command on Event timeout
2019-09-04 18:20:06 -07:00
5908830f39
Merge branch 'patch-2' into 'dev'
...
Added Language vars to super.ejs
See merge request Shinobi-Systems/Shinobi!96
2019-08-30 17:07:44 +00:00
c501a8929a
Fix Timelapse JPEG generatorUrl, Fix Power Video video launch on drag
...
+ minor cleanup of unused files
2019-08-30 10:00:25 -07:00
ad93dabe1a
Merge branch 'dev' into 'patch-2'
...
# Conflicts:
# languages/sv_SE.json
2019-08-29 11:25:57 +00:00
fd7487fca8
Update sv_SE.json
2019-08-29 11:23:48 +00:00
e7632b6a71
Merge branch 'patch-4' into 'dev'
...
Added deleted locale for calendar
See merge request Shinobi-Systems/Shinobi!103
2019-08-28 15:03:10 +00:00
ee3d1d21b3
Merge branch 'patch-3' into 'dev'
...
Fixes for multimon.ejs, lang vars, move/labels
See merge request Shinobi-Systems/Shinobi!101
2019-08-28 15:02:37 +00:00
d117ba00f9
Merge branch 'Add-lang-vars' into 'dev'
...
Added language variables
See merge request Shinobi-Systems/Shinobi!94
2019-08-28 15:01:06 +00:00
1da12d4edf
Merge branch 'dev' into 'dev'
...
Changed password field type to password, as part of Shinobi-Systems/ShinobiCE#20
See merge request Shinobi-Systems/Shinobi!108
2019-08-28 14:54:53 +00:00
93205068fd
Now generates a random cron key during install
2019-08-26 19:54:07 +00:00
754b23bc10
Update CentOS - Quick Install.sh
2019-08-26 19:51:54 +00:00
775741eb91
Now generates a random cron key during setup
2019-08-26 19:50:50 +00:00
1b73aa872a
Changed password field type to password, as part of https://gitlab.com/Shinobi-Systems/ShinobiCE/issues/20
2019-08-26 14:26:06 +00:00
2a1871a016
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2019-08-25 12:24:39 -07:00
55a64cfb83
CentOS installer updates
2019-08-25 12:21:29 -07:00
cc3c016470
Merge branch 'dev' into 'dev'
...
Updated to better work with update Ninja installer
See merge request Shinobi-Systems/Shinobi!105
2019-08-25 18:39:04 +00:00
7152814b4c
Added lockout for tasks completed by Ninja installer
2019-08-22 18:33:38 +00:00
53b1ca2c9e
modified call for CentOS quick installer
2019-08-22 18:32:39 +00:00
1f88060f16
Added deleted locale for calendar
2019-08-20 07:44:59 +00:00
1dcd5278ff
Update en_CA.js
2019-08-20 06:51:45 +00:00
851aff49df
Update en_CA.js
2019-08-19 13:46:54 +00:00
Moe
Austin Lakeman
DewGew
Mike Hurley