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 |
|
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 |
Andrew Bauer
|
de345090df
|
Merge pull request #1635 from pliablepixels/1634-api-utf8-fix
enabled utf8
|
2016-09-30 12:47:24 -05: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
|
cf9fa78ca3
|
work on fixing event view
|
2016-09-29 09:28:48 -04:00 |
|
Isaac Connor
|
07ae6b6aa2
|
commit authhash to session
|
2016-09-28 11:49:00 -04:00 |
|
Isaac Connor
|
09f7c9ddf9
|
Merge pull request #1633 from bhaal2/storageareas
Storageareas
|
2016-09-28 09:43:00 -04:00 |
|
Isaac Connor
|
9808297d72
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-28 09:14:54 -04:00 |
|
Isaac Connor
|
d67cb0d0df
|
add recipes to detect libv4l2
|
2016-09-28 09:14:44 -04:00 |
|
Isaac Connor
|
a3a4574c84
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-28 09:09:19 -04:00 |
|
Isaac Connor
|
994f1d566e
|
fix [
|
2016-09-28 09:09:01 -04:00 |
|
Isaac Connor
|
9bf48d27b1
|
implement caching the authhash in the session
|
2016-09-28 09:08:49 -04:00 |
|
Isaac Connor
|
1ae23b49bf
|
generateAuthHash early when session is active, it will get cached in session
|
2016-09-28 09:08:36 -04:00 |
|
Isaac Connor
|
48d9f31fa9
|
add more debug
|
2016-09-28 09:08:00 -04:00 |
|
Isaac Connor
|
00ef0f4d78
|
alter code to use libv4l2
|
2016-09-28 08:43:41 -04:00 |
|
Isaac Connor
|
b074a3257d
|
add StartTime to log line about deleting an event.
|
2016-09-28 08:35:19 -04:00 |
|
Isaac Connor
|
02a196d98b
|
add missing ]
|
2016-09-28 08:30:22 -04:00 |
|
Isaac Connor
|
4e87ca96c6
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-28 07:10:44 -04:00 |
|
Isaac Connor
|
187e952ffc
|
append PATH_WEB for relative dir_events when instsantiating default Storage Object
|
2016-09-28 07:10:20 -04:00 |
|
Isaac Connor
|
ce2c52c07d
|
allow libavdevice55 and 57
|
2016-09-27 16:15:24 -04:00 |
|
Isaac Connor
|
da5bad7ec2
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-27 15:09:14 -04:00 |
|
Isaac Connor
|
24e33fec7f
|
allow libvlccore8
|
2016-09-27 15:08:00 -04:00 |
|
Isaac Connor
|
730d7a648d
|
add -f to rm
|
2016-09-27 14:15:38 -04:00 |
|
Isaac Connor
|
0ee9345433
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-27 13:34:26 -04:00 |
|
Isaac Connor
|
89d4b9fec5
|
ifdef the libswresample lib stuff
|
2016-09-27 13:34:10 -04:00 |