Isaac Connor
|
ec6782a663
|
fix ZM_SERVER_ID instead of ZM_SERVER
|
2016-04-04 16:33:46 -04:00 |
|
Isaac Connor
|
dd7f399959
|
Merge branch 'remove_local_zm_conf_override' into storageareas
|
2016-04-04 16:13:44 -04:00 |
|
Isaac Connor
|
6c92c0e3f7
|
Merge branch 'reload_stream_on_scale' into storageareas
|
2016-04-04 16:13:35 -04:00 |
|
Isaac Connor
|
98fce7c3c6
|
Merge branch 'reload_stream_on_error' into storageareas
|
2016-04-04 16:13:26 -04:00 |
|
Isaac Connor
|
bc9760ce79
|
Merge branch 'master' into storageareas
|
2016-04-04 16:13:17 -04:00 |
|
Isaac Connor
|
123a1a898a
|
try to reload the image stream on error.
|
2016-04-04 15:04:09 -04:00 |
|
Isaac Connor
|
0b13f9d76f
|
reload stream on scale change
|
2016-04-04 14:58:07 -04:00 |
|
Isaac Connor
|
02eb36040a
|
fix bad code
|
2016-04-04 12:01:37 -04:00 |
|
Isaac Connor
|
faa75bbe39
|
fix wrong brace and needs quotes
|
2016-04-04 12:00:29 -04:00 |
|
Isaac Connor
|
b3fed1767b
|
Add Concurrent value to the PurgeWhenFull Filter. Default to false
|
2016-04-04 11:57:11 -04:00 |
|
Isaac Connor
|
b3f0f5d0e8
|
Merge branch 'updated-console' into storageareas
|
2016-04-04 11:51:07 -04:00 |
|
Isaac Connor
|
197ae67313
|
Merge branch 'always_show_ptz' into storageareas
|
2016-04-04 11:47:29 -04:00 |
|
Isaac Connor
|
3e20e5f21c
|
fix ptz control box size
|
2016-04-04 11:40:01 -04:00 |
|
Isaac Connor
|
9dfe71ceb8
|
Always show events and always show ptz controls. Also clean out some commented out cruft
|
2016-04-04 11:39:12 -04:00 |
|
Isaac Connor
|
2233747fcb
|
add a missing t
|
2016-04-04 11:38:16 -04:00 |
Isaac Connor
|
43e4052dd9
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-04 11:36:03 -04:00 |
|
Isaac Connor
|
dd153d8efb
|
add header.php to autotools build
|
2016-04-04 11:35:51 -04:00 |
|
Isaac Connor
|
a31660c1f6
|
Remove the code looks for zm.conf in the current dir.
|
2016-04-04 10:45:58 -04:00 |
|
Isaac Connor
|
9276eea491
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-04-04 09:38:06 -04:00 |
Isaac Connor
|
46ac2301a7
|
Merge pull request #1376 from laerciomotta/patch-1
Improve test multiserver restart cam.
|
2016-04-04 09:29:36 -04:00 |
|
Isaac Connor
|
b3c7002eca
|
install view_video as well
|
2016-04-01 15:44:37 -04:00 |
|
Isaac Connor
|
96aa20fb79
|
value should be lower case when checking for rtsp
|
2016-04-01 15:43:59 -04:00 |
|
Isaac Connor
|
8a2605578a
|
fix type in htmlSelect
|
2016-04-01 15:43:40 -04:00 |
|
Isaac Connor
|
d71eaa66ec
|
use view_video.php as a short-term fix for viewing video
|
2016-04-01 15:43:31 -04:00 |
|
Isaac Connor
|
5f6d140de5
|
Load all event fields, so we know we have them deeper in the code.
|
2016-04-01 14:07:27 -04:00 |
|
Isaac Connor
|
9493e99587
|
Add video file to event data.
|
2016-04-01 14:06:31 -04:00 |
|
Isaac Connor
|
03cae9d2f2
|
Add video file to event data.
|
2016-04-01 14:06:28 -04:00 |
|
Isaac Connor
|
ca96481036
|
fix thumbnail generation from video file
|
2016-04-01 13:02:31 -04:00 |
|
Isaac Connor
|
cbebdfe670
|
add Time function to get unixtime from StartTime
|
2016-04-01 13:00:59 -04:00 |
|
Isaac Connor
|
6816a4c75b
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-01 11:35:38 -04:00 |
|
Isaac Connor
|
59bf780537
|
introduce htmlSelect as a better version of buildSelect
|
2016-04-01 10:35:59 -04:00 |
|
Isaac Connor
|
3140905d02
|
whitespace and structure changes to match google coding style. Use new htmlSelect function to build the select dropdowns. Use a monitor object instead of a newMonitor array
|
2016-04-01 10:35:34 -04:00 |
|
Isaac Connor
|
c074f6e0bf
|
Add a set function to take an array of value to set in the Object
|
2016-04-01 10:34:40 -04:00 |
|
Isaac Connor
|
e7ee464a17
|
Add a RecordAudio setting to the Storage Tab
|
2016-03-31 15:50:44 -04:00 |
|
Isaac Connor
|
2a892c5b9a
|
Merge branch 'iconnor_video' into storageareas
|
2016-03-31 15:34:52 -04:00 |
|
Isaac Connor
|
5c68e0c9cb
|
structure, whitespace fixes. Add not storing audio frames
|
2016-03-31 15:33:27 -04:00 |
|
Isaac Connor
|
742fab2ea4
|
Add db updates for Video and recordAudio
|
2016-03-31 15:32:24 -04:00 |
|
Isaac Connor
|
fbc96fed61
|
bump version to 1.30, neccessary for db update scripts
|
2016-03-31 15:32:02 -04:00 |
|
Isaac Connor
|
1220f22eac
|
Merge branch 'iconnor_video' into storageareas
|
2016-03-31 14:04:58 -04:00 |
|
Isaac Connor
|
56d95bb949
|
Merge branch 'iconnor_video' into storageareas
|
2016-03-31 14:02:56 -04:00 |
|
Isaac Connor
|
c7e766faef
|
finish the record_audio constructor defs
|
2016-03-31 13:30:31 -04:00 |
|
Isaac Connor
|
c26dbb9028
|
rough in record_audio, and do lots of whitespace cleanups
|
2016-03-31 12:54:56 -04:00 |
|
Isaac Connor
|
2a3ed0c32c
|
Add record_audio member, also correct whitespace
|
2016-03-31 12:17:17 -04:00 |
|
Isaac Connor
|
4e8255c80a
|
Add record_audio member
|
2016-03-31 12:16:50 -04:00 |
|
Isaac Connor
|
92b98e1953
|
spacing, code structure and code documentation. Also, add in a flag to say whether to store the audio packets
|
2016-03-31 11:55:21 -04:00 |
|
Isaac Connor
|
fa08646243
|
spacing fix
|
2016-03-31 11:54:21 -04:00 |
|
Isaac Connor
|
74301b3ff3
|
Add the dependencies for libmp4v2
|
2016-03-31 11:53:36 -04:00 |
|
Isaac Connor
|
aa516dd575
|
undo the multi-line
|
2016-03-31 11:24:27 -04:00 |
|
Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -04:00 |
Laercio Motta
|
ad912a6c6b
|
Improve test multiserver restart camera. (FIX)
Check if the server is correctly before restart cam and multiserver is activate.
|
2016-03-31 09:45:13 -03:00 |