Isaac Connor
|
de9c5a3bed
|
add in missing break
|
2016-10-18 10:20:42 -04:00 |
|
Isaac Connor
|
573c712fc2
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-10-18 09:50:34 -04:00 |
|
Isaac Connor
|
420d141bc7
|
split the reading of max fps and alarm max fps to remove an extra atof and make them more understandable
|
2016-10-18 09:50:01 -04:00 |
|
Isaac Connor
|
85faa7321c
|
reorder if logic to handle first page load before AuthHash has ever been set.
|
2016-10-17 13:12:13 -04:00 |
|
Isaac Connor
|
b731cd1a4c
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-10-12 16:17:51 -04:00 |
|
Isaac Connor
|
5a842f34cf
|
fix extra ,
|
2016-10-12 16:17:43 -04:00 |
|
Isaac Connor
|
0c39ec1492
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-10-12 15:40:50 -04:00 |
|
Isaac Connor
|
4bb9709cb2
|
use object methods of Event
|
2016-10-12 15:39:53 -04:00 |
|
Isaac Connor
|
dcf6a39bf6
|
split Event and Monitor into objects and use properties from appropriate object
|
2016-10-12 15:39:32 -04:00 |
|
Isaac Connor
|
c2911ae756
|
better debug in deletePath
|
2016-10-12 15:38:59 -04:00 |
|
Isaac Connor
|
3baa64aa52
|
add caller info to log when a bad argument is passed to event constructor
|
2016-10-12 15:38:40 -04:00 |
|
Isaac Connor
|
bf4bbf8b8d
|
use object methods for event deletion. Main benefit is error message when deleting
|
2016-10-12 15:36:40 -04:00 |
|
Isaac Connor
|
ba7d935a85
|
fix border size of text below the image in montage when alerted.
|
2016-10-12 12:19:04 -04:00 |
|
Isaac Connor
|
5b8b9c5345
|
merge update
|
2016-10-12 09:24:10 -04:00 |
|
Isaac Connor
|
b4f065eb75
|
Convert event view to use Objects
|
2016-10-12 09:17:57 -04:00 |
|
Isaac Connor
|
9656a7c3e8
|
Store Oriention on event creation
|
2016-10-12 09:12:09 -04:00 |
|
Isaac Connor
|
1862611b94
|
add Orientation to Events table
|
2016-10-12 09:11:50 -04:00 |
|
Isaac Connor
|
b00588b6ff
|
add back montagereview
|
2016-10-11 17:35:41 -04:00 |
|
Isaac Connor
|
0903ef294f
|
quick for to make MontageReview work
|
2016-10-11 17:35:28 -04:00 |
|
Isaac Connor
|
e1c91bb5fd
|
Merge branch 'fix_disable_monitor' into storageareas
|
2016-10-11 12:21:15 -04:00 |
|
Isaac Connor
|
0358476ac0
|
Merge branch 'fix_popup' into storageareas
|
2016-10-11 12:19:38 -04:00 |
|
Isaac Connor
|
743e8c59f9
|
google code style and double to single quotes
|
2016-10-11 12:11:59 -04:00 |
|
Isaac Connor
|
0c956d6728
|
fix logic when disabling a monitor
|
2016-10-11 12:11:33 -04:00 |
|
Isaac Connor
|
c02b840274
|
Fix logic when disabling a monitor
|
2016-10-11 12:10:47 -04:00 |
|
Isaac Connor
|
ded1e0ea73
|
handle when window.open fails
|
2016-10-11 11:48:29 -04:00 |
|
Isaac Connor
|
346975fd1d
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-10-07 11:39:32 -04:00 |
|
Isaac Connor
|
2b37999cd5
|
Merge branch 'fix_zm_image_memleak' into storageareas
|
2016-10-07 11:39:03 -04:00 |
|
Isaac Connor
|
006fcad10a
|
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
|
2016-10-07 11:35:14 -04:00 |
|
Isaac Connor
|
37a4c67ae6
|
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
|
2016-10-07 11:33:25 -04:00 |
|
Isaac Connor
|
96b5af9021
|
Merge branch 'fix_onvif' into storageareas
|
2016-10-04 15:00:28 -04:00 |
|
Isaac Connor
|
ac24865647
|
add NoDetectProfiles instead of reusing NoDetectedCameras
|
2016-10-04 14:33:51 -04:00 |
|
Isaac Connor
|
6814bcc791
|
add NoDetectProfiles instead of reusing NoDetectedCameras
|
2016-10-04 14:33:38 -04:00 |
|
Isaac Connor
|
7561dc00ea
|
be explici about which unnamed array we are access for getopts. Default username and password to ''
|
2016-10-04 14:33:13 -04:00 |
|
Isaac Connor
|
e7eab488c9
|
password is not required, set it to '' to quiet warnings
|
2016-10-04 14:28:30 -04:00 |
|
Isaac Connor
|
84a18926d8
|
password is not required, set it to '' to quiet warnings
|
2016-10-04 14:28:03 -04:00 |
|
Isaac Connor
|
09c5e3012a
|
username and password don't actually have to be specified
|
2016-10-04 14:09:32 -04:00 |
|
Isaac Connor
|
df255d3d5d
|
check for existence of attribute before calling it to break gently
|
2016-10-04 14:07:11 -04:00 |
|
Isaac Connor
|
866b6fea8c
|
Fall back to getCapabilities if getServices is not supported.
|
2016-10-04 14:06:23 -04:00 |
|
Isaac Connor
|
21a94a6200
|
better error message
|
2016-10-04 10:29:37 -04:00 |
|
Isaac Connor
|
c1f9c0aff5
|
also need ProbeMatchesType to inherit get_ProbeMatch
|
2016-10-04 10:16:01 -04:00 |
|
Isaac Connor
|
b742d316b3
|
apply use strict and fix issues
|
2016-10-04 10:15:16 -04:00 |
|
Isaac Connor
|
e6626cef69
|
if soap version is specified for probe, don't do both versions
|
2016-10-04 09:51:20 -04:00 |
|
Isaac Connor
|
de22f21813
|
for soap 1.2 only probe for NetworkVideoTransmitter
|
2016-10-04 09:36:28 -04:00 |
|
Isaac Connor
|
92d32596cc
|
revert
|
2016-10-03 21:59:49 -04:00 |
|
Isaac Connor
|
68936b9af9
|
code style, replace with '
|
2016-10-03 21:58:57 -04:00 |
|
Isaac Connor
|
d4be5b06ea
|
Only generate auth hash when logged in.
|
2016-10-03 21:22:16 -04:00 |
|
Isaac Connor
|
f4418260e7
|
Should only generate an auth hash if we are logged in.
|
2016-10-03 21:18:13 -04:00 |
|
Isaac Connor
|
a6c77f08d2
|
use generic libboost-dev
|
2016-10-02 15:22:52 -04:00 |
|
Isaac Connor
|
16bee2ef55
|
only generate auth hash if we are logged in
|
2016-10-02 14:13:54 -04:00 |
|
Isaac Connor
|
056e560b70
|
Merge ../ZoneMinder.master into storageareas
|
2016-10-02 12:25:51 -04:00 |