Isaac Connor
|
7f059b750f
|
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
|
2017-01-11 14:25:46 -05:00 |
|
Isaac Connor
|
23b40da598
|
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
|
2017-01-11 14:25:12 -05:00 |
|
Isaac Connor
|
8653822bff
|
cleanup av_packet_unref/free_packet by using our zm_av_packet_unref
|
2017-01-11 14:22:37 -05:00 |
|
Isaac Connor
|
87daba346b
|
fix else behaviour by adding braces
|
2017-01-11 14:18:56 -05:00 |
|
Isaac Connor
|
0d5910644e
|
whitespace and braces fixes. Also add some braces to fixup a compiler error about the else not doing what it should be.
|
2017-01-11 14:18:11 -05:00 |
|
Isaac Connor
|
16fdac3179
|
fix remSocketFile to remSockFile
|
2017-01-11 11:14:00 -05:00 |
|
Isaac Connor
|
2436e40f5d
|
Merge branch 'master' into storageareas
|
2017-01-11 10:34:27 -05:00 |
|
Isaac Connor
|
5d03e9f50e
|
Merge branch 'fix_1743_Edimax' into storageareas
|
2017-01-11 10:34:08 -05:00 |
Kyle Johnson
|
132249e96d
|
Merge pull request #1744 from connortechnology/fix_1743_Edimax
change regexp to handle quotes in the content-type line.
|
2017-01-11 07:42:28 -07:00 |
Isaac Connor
|
bc04cb2620
|
Merge pull request #1742 from knnniggett/controlcap_fix
fix conditional logic in controlcap.js
|
2017-01-11 09:13:43 -05:00 |
|
Isaac Connor
|
c0e929f136
|
change regexp to handle quotes in the content-type line. This is needed for edimax cameras
|
2017-01-11 09:11:27 -05:00 |
Andy Bauer
|
7ef7a36f39
|
fix conditional logic in controlcap.js
|
2017-01-10 17:53:05 -06:00 |
|
Andrew Bauer
|
01743b1fd9
|
Merge pull request #1741 from connortechnology/control_fixes
Control fixes
|
2017-01-10 17:33:09 -06:00 |
|
Isaac Connor
|
7502b81064
|
zmMemVerify now checks valid, so don't need to do it again.
|
2017-01-10 15:32:38 -05:00 |
|
Isaac Connor
|
04f66917ae
|
Merge branch 'fix_mmap_leak' into storageareas
|
2017-01-10 15:29:54 -05:00 |
|
Isaac Connor
|
7ddd5359d0
|
zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good
|
2017-01-10 15:09:30 -05:00 |
|
Isaac Connor
|
a146d7bee1
|
add a test for valid in the shared data. zmc sets this to false when it closes properly
|
2017-01-10 15:08:49 -05:00 |
|
Isaac Connor
|
faeb785961
|
zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good
|
2017-01-10 15:08:23 -05:00 |
|
Isaac Connor
|
4d84387807
|
Merge branch 'fix_mmap_leak' into work
|
2017-01-10 14:22:58 -05:00 |
|
Isaac Connor
|
a66e9e45a2
|
merge a fix from storageareas that adds a test for the shared data being valid and reloads the monitors if it can't reconnect
|
2017-01-10 14:22:42 -05:00 |
|
Isaac Connor
|
d2ff6701f4
|
test
|
2017-01-10 13:53:02 -05:00 |
|
Isaac Connor
|
b3c5f4622f
|
revert knnniggett's zmMemDetach changes
|
2017-01-10 12:56:19 -05:00 |
|
Isaac Connor
|
3074263e06
|
Merge branch 'control_fixes' into storageareas
|
2017-01-10 12:54:46 -05:00 |
|
Isaac Connor
|
55403219d8
|
fix regexp for direction in control command. Also log if the regexp doesn't match
|
2017-01-10 12:35:38 -05:00 |
|
Isaac Connor
|
fea5fa1b59
|
fix xtell should be -1 for move left
|
2017-01-10 12:35:02 -05:00 |
|
Isaac Connor
|
66cdcd95fa
|
Merge branch 'master' into fix_mmap_leak
|
2017-01-10 08:47:46 -05:00 |
|
Andrew Bauer
|
03d71695e0
|
Merge pull request #1727 from StefanLindblom/1726-monitor-preset-qihan
Add MonitorPreset for Qihan IP cameras via RTSP
|
2017-01-10 07:36:59 -06:00 |
Stefan Lindblom
|
40d3da3521
|
Merge branch '1726-monitor-preset-qihan' of https://github.com/StefanLindblom/ZoneMinder into 1726-monitor-preset-qihan
|
2017-01-10 12:06:48 +01:00 |
|
Stefan Lindblom
|
fa416ef889
|
Add MonitorPreset for Qihan IP cameras via RTSP
|
2017-01-10 12:02:47 +01:00 |
|
Isaac Connor
|
d8b8d78576
|
Fix storagearea lookup. Default to ZM_EVENTS_DIR
|
2017-01-09 16:35:58 -05:00 |
|
Isaac Connor
|
03fd964518
|
fix parsing StorageID
|
2017-01-09 14:59:14 -05:00 |
|
Isaac Connor
|
7ef0c2c9d3
|
fix deleting filters. We don't need to set fid anymore
|
2017-01-09 14:58:55 -05:00 |
|
Isaac Connor
|
cc724a5542
|
add a question mark to delete confirmation
|
2017-01-09 14:53:13 -05:00 |
Andrew Bauer
|
06fd760a2a
|
rpm specfile- use %{_localstatedir} macro
|
2017-01-09 09:07:05 -06:00 |
Andrew Bauer
|
dc6b2ed114
|
clean up unnessary requires
|
2017-01-08 18:17:28 -06:00 |
|
Andrew Bauer
|
6b7e3a1b61
|
rpm specfile changes
|
2017-01-08 17:37:03 -06:00 |
|
Isaac Connor
|
99e823ef33
|
Merge branch 'zmtelemetry_improvements' into storageareas
|
2017-01-08 11:04:59 -05:00 |
|
Isaac Connor
|
27760ffce2
|
move pod below __END__ and improve it to include options. Add help option.
|
2017-01-08 10:12:25 -05:00 |
|
Isaac Connor
|
b3a07c27b8
|
Add test for lastCheck being in the future. print out a notice when we are sleeping and are being run from a terminal.
|
2017-01-08 09:40:09 -05:00 |
|
Isaac Connor
|
146a772a21
|
move ENDPOINT to hidden category
|
2017-01-06 19:49:03 -05:00 |
|
Isaac Connor
|
03b19bc1fd
|
when run from terminal, output a line that says that we are sleeping
|
2017-01-06 18:40:39 -05:00 |
|
Isaac Connor
|
7f2fcddc03
|
revert print to Info
|
2017-01-06 18:39:08 -05:00 |
|
Isaac Connor
|
dccd1e9732
|
fix
|
2017-01-05 13:54:34 -05:00 |
|
Isaac Connor
|
2bc47a000c
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-05 11:31:41 -05:00 |
|
Isaac Connor
|
71ad08613e
|
fix
|
2017-01-05 11:30:01 -05:00 |
|
Isaac Connor
|
426eabb12d
|
if running from a terminal, set termLevel to info
|
2017-01-05 11:24:53 -05:00 |
|
Isaac Connor
|
db1a6f9b3b
|
fix to remove qqq
|
2017-01-05 11:24:27 -05:00 |
|
Isaac Connor
|
d1ed472db0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-05 10:09:11 -05:00 |
|
Isaac Connor
|
75cd1de7ab
|
show the # of entries loaded and saved
|
2017-01-05 09:42:11 -05:00 |
|
Isaac Connor
|
0c34aa9830
|
Merge branch 'zmtelemetry_improvements' into storageareas
|
2017-01-04 12:25:01 -05:00 |