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
|
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 |
|
Isaac Connor
|
0df70a7e0f
|
if out the new code that frees structure on Image destroy. It creates a memleak
|
2016-10-02 12:24:33 -04:00 |
|
Isaac Connor
|
4fc64e4874
|
fix crash when not compiled with libswresample
|
2016-10-02 12:24:19 -04:00 |
|
Isaac Connor
|
10e451faa6
|
fix log line
|
2016-10-02 12:23:19 -04:00 |
|
Isaac Connor
|
07d6e1303b
|
Merge branch 'compress_logs' into storageareas
|
2016-10-02 12:22:46 -04:00 |
|
Isaac Connor
|
f5914939df
|
Revert "if out the new code that frees structure on Image destroy. It creates a memleak"
This reverts commit bb174ba49d.
|
2016-10-02 12:21:56 -04:00 |
|
Isaac Connor
|
bb174ba49d
|
if out the new code that frees structure on Image destroy. It creates a memleak
|
2016-10-02 12:20:39 -04:00 |
|
Isaac Connor
|
9e3f6226ed
|
add compress and delaycompress to the zoneminder logrotate settings
|
2016-10-02 10:05:07 -04:00 |
|
Isaac Connor
|
f09c6c92e8
|
blah
|
2016-09-30 12:22:35 -04:00 |
|
Isaac Connor
|
e11ded83ba
|
get rid of watch:
|
2016-09-30 12:15:23 -04:00 |
|
Isaac Connor
|
bf013cd88e
|
remove libswsresample
|
2016-09-30 11:58:55 -04:00 |
|
Isaac Connor
|
fb4a2babc7
|
better debug message
|
2016-09-30 09:37:41 -04:00 |
Isaac Connor
|
53d3e063e8
|
smal re-order
|
2016-09-30 09:35:52 -04:00 |
Andrew Bauer
|
b064383248
|
Merge pull request #1643 from connortechnology/master
Add a TZ env setting for systemd.
|
2016-09-29 14:13:57 -05:00 |
|
Isaac Connor
|
603d903297
|
add an environment setting for TZ which eliminates a stat on /etc/locatime on every log line
|
2016-09-29 14:24:49 -04:00 |
|
Isaac Connor
|
8d6217f19d
|
Add a line to set the TZ variable in the env before spawning zoneminder. This prevents /etc/localtime from being stat'd on every logging call.
|
2016-09-29 14:06:12 -04:00 |
|
Isaac Connor
|
e423e0802c
|
put back the needed sql and add a lot of debugging
|
2016-09-29 12:22:32 -04:00 |
|
Isaac Connor
|
0ab84abe5b
|
Since we are returning a hash called user, it should really contain all data for that user.
|
2016-09-29 10:43:07 -04:00 |
Isaac Connor
|
ef6b3d01e4
|
Merge pull request #4 from ZoneMinder/master
Updates
|
2016-09-29 10:26:04 -04:00 |
|
Isaac Connor
|
404bbb79f0
|
must return the generated hash
|
2016-09-29 10:11:37 -04:00 |
|
Isaac Connor
|
8bc7b9562f
|
introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for
|
2016-09-29 10:04:53 -04:00 |
|
Isaac Connor
|
a77de33997
|
add a test for lib existence
|
2016-09-27 12:51:04 -04:00 |
|
Isaac Connor
|
303a2c6c5f
|
re-open session if neccessary to save AuthHashGeneratedAt
|
2016-09-27 11:56:31 -04:00 |
|
Isaac Connor
|
4ce531099c
|
add an auth field to request=stream results to give the client a new auth hash to use
|
2016-09-27 11:03:12 -04:00 |
|
Isaac Connor
|
66ae5c52ae
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-09-16 09:36:41 -04:00 |
|
Isaac Connor
|
5f46b8f942
|
Merge pull request #1621 from connortechnology/fix_1620
ptzControl expects a monitor object instead of a dbrow array.
|
2016-09-15 10:18:26 -04:00 |
|
Isaac Connor
|
3dfe1185ff
|
add ffmpeg as option to libav-tols
|
2016-09-13 10:11:50 -04:00 |
|
Isaac Connor
|
54db9f2e3a
|
ptzControl expects a monitor object instead of a dbrow array.
|
2016-09-12 21:36:03 -04:00 |
Steve Gilvarry
|
54375d7653
|
Merge pull request #1587 from knnniggett/travis-zmonvif-off
don't build the onvif libraries in travis
|
2016-09-11 14:14:33 +10:00 |
|
Steve Gilvarry
|
563f4a9d46
|
Merge pull request #1505 from ZoneMinder/fix_filter_actions
Confirmed check box status is now retained after save and changing filters.
|
2016-09-11 14:13:51 +10:00 |
|
Andrew Bauer
|
e35ef3ce83
|
Merge pull request #1617 from coracis/master
Update German translation
|
2016-09-09 08:55:19 -05:00 |