979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
b72d520e02
implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it.
2018-08-03 10:02:42 -04:00
7ed316d3a5
We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148
2018-07-10 11:49:45 -04:00
09aa3afaac
Fix capitalisation of Ffmpeg
2018-06-16 16:47:09 -04:00
f2d00b6af5
update Storage Video Writer options to only allow Passthrough for FFmpeg
2018-06-14 13:39:13 -04:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
80f73854c7
Include the groupIds hidden when not on general tab
2018-04-25 09:33:02 -04:00
983cd83054
Add default for SignalCheckPoints and add it as a hidden field to the non-misc tabs
2018-04-19 10:01:04 -04:00
cd70ed3dec
always show SignalCheckColour and add a SignalCheckPoints option
2018-04-19 09:45:28 -04:00
c7deb91319
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-04-14 14:58:25 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
49aeb4b467
whitespace
2018-04-03 10:38:38 -07:00
0bb1c5ce71
load groups when duping a monitor
2018-03-23 13:35:45 -07:00
03d3f5e665
Merge branch 'storageareas' into zma_to_thread
2018-03-03 13:28:01 -08:00
c443168389
split out codec and encoder, allowing one to specify which encoder to use
2018-02-28 07:17:16 -08:00
c5eec7e2fd
hide save button on successful form completion so we don't get a duplicate submit
2018-02-27 15:10:45 -08:00
83fad681b3
use button tags and hide the button content after click
2018-02-27 11:49:13 -08:00
c50627fd88
GroupIds needs to be an array
2018-02-27 11:21:04 -08:00
6a6eb87686
fix defaults
2018-02-26 18:00:02 -08:00
793e87c26d
Apply chosen style to group and linked monitors dropdown
2018-02-26 17:58:20 -08:00
92c34f6043
add Groups to monitor edit
2018-02-26 16:09:36 -08:00
67b365948e
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
2018-01-29 15:53:26 -05:00
42a27c2ca9
Fix Servers dropdown
2018-01-25 08:41:54 -08:00
573c44839a
Merge branch 'storageareas' into zma_to_thread
2018-01-16 17:39:37 -05:00
b09bb528a5
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-16 08:42:41 -08:00
9284e26512
get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot.
2018-01-13 15:15:14 -05:00
5f8756d7ad
Set Tesla defaults for new monitors
2018-01-12 08:11:37 -08:00
99968dfa2a
Merge branch 'storageareas' into zma_to_thread
2017-11-27 11:28:36 -05:00
d6bc727c9c
use htmlSelect to create the Colours dropdown, which fixes a problem caused when I inverted the Colours array
2017-11-26 11:12:00 -05:00
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
c6515b7564
Merge branch 'storageareas' into zma_to_thread
2017-11-21 12:28:41 -05:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
57c8cdde63
Merge branch 'storageareas' into put_ffmpeg_into_event_wip
2017-11-14 02:45:34 -05:00
bafdf1fdfc
add codecs and containers
2017-11-13 21:41:57 -05:00
1632aa7349
fix nvsocket
2017-11-13 14:25:19 -08:00
14e9a13c99
wip
2017-11-09 11:53:04 -08:00
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
b6dde354be
rename AnalysisFPS to AnalysisFPSLimit
2017-10-24 17:34:32 -07:00
8abb8a9259
add Type to Storage
2017-10-12 07:32:48 -07:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
54b8cce5e4
fix tabs to spaces
2017-09-11 16:57:51 -04:00
edb7762cf3
Merge branch 'master' into storageareas
2017-09-11 16:57:08 -04:00
496ba70819
remove checks for empty and just check for true ( #1980 )
...
Yeah I agree. I think the exists was from pre-object method days.
2017-09-11 13:27:17 -04:00
5a73c38237
video storage fixes ( #1958 )
...
* use a monitor object instead of just a db array.
* fix braces, spacing, move pod docs to bottom
* Fix memleak by freeing input and output frames
* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
aff7e94725
default to TCP for Method
2017-07-13 10:23:30 -04:00
363303efa9
use isset instead of empty to get rid of warning
2017-07-13 10:08:36 -04:00
6fc1581b9e
use a monitor object instead of just a db array.
2017-06-28 20:33:53 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor
Isaac Connor
APHW2 MFGENG