Isaac Connor
|
48ad0b77fc
|
merge updates for newer releases of packages
|
2017-05-23 14:39:31 -04:00 |
|
Isaac Connor
|
5f1b084cc5
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-23 14:27:07 -04:00 |
|
Isaac Connor
|
655839e56a
|
Allow NULLS in various fields
|
2017-05-23 14:20:19 -04:00 |
|
Isaac Connor
|
433515dba9
|
Allow NULLS in LinkedMonitors
|
2017-05-23 14:14:24 -04:00 |
|
Isaac Connor
|
b828f0501c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-23 14:07:19 -04:00 |
|
Isaac Connor
|
739d1e5304
|
Add lines to Convert db to allow NULLS
|
2017-05-23 14:07:10 -04:00 |
Isaac Connor
|
4347ee1258
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-23 10:41:40 -04:00 |
|
Isaac Connor
|
13265a8f4f
|
undo StorageAreas contents
|
2017-05-23 10:41:21 -04:00 |
Steve Gilvarry
|
efa29b6a64
|
Merge pull request #1891 from SteveGilvarry/master
Revert h264 README.md changes again.......................
|
2017-05-23 20:27:00 +10:00 |
|
SteveGilvarry
|
55df858ded
|
Revert h264 README.md changes again.......................
|
2017-05-23 20:25:36 +10:00 |
|
Isaac Connor
|
75dc774a08
|
Continue to support non-USE_DEEP_STORAGE option
|
2017-05-22 21:21:49 -04:00 |
|
Isaac Connor
|
dbf83831ff
|
merge from SA. Adds the ability to pass in additional options when connecting
|
2017-05-20 10:32:41 -04:00 |
|
Isaac Connor
|
d76d65f475
|
merge from SA, includes StorageAreas support
|
2017-05-20 10:32:04 -04:00 |
|
Isaac Connor
|
2f2b75252f
|
remove Makefile.am
|
2017-05-20 10:23:32 -04:00 |
|
Isaac Connor
|
54c9c37b21
|
Merge ../ZoneMinder.connortechnology
|
2017-05-20 09:55:06 -04:00 |
|
Isaac Connor
|
03495e8c23
|
fix
|
2017-05-20 09:54:03 -04:00 |
|
Isaac Connor
|
bb50784ed2
|
braces
|
2017-05-20 09:53:35 -04:00 |
|
Isaac Connor
|
0da03ca5e8
|
braces/whitespace
|
2017-05-20 09:41:13 -04:00 |
|
Isaac Connor
|
b123bd1da3
|
remove uneccessary zm_packetqueue.h
|
2017-05-20 09:12:05 -04:00 |
|
Isaac Connor
|
40993ce401
|
braces
|
2017-05-20 09:11:35 -04:00 |
|
Isaac Connor
|
23633ce30b
|
braces
|
2017-05-20 09:06:12 -04:00 |
|
Isaac Connor
|
a5ee8307d0
|
Merge ../ZoneMinder.connortechnology
|
2017-05-20 09:03:57 -04:00 |
|
Isaac Connor
|
457d7e5c94
|
code documentation, whitespace
|
2017-05-20 09:03:51 -04:00 |
|
Isaac Connor
|
6ec5a18a35
|
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
|
2017-05-20 09:03:09 -04:00 |
|
Isaac Connor
|
dba947346a
|
braces
|
2017-05-20 09:03:04 -04:00 |
|
Isaac Connor
|
381d44439a
|
merge SA. braces/whitespace debugging
|
2017-05-20 09:01:32 -04:00 |
|
Isaac Connor
|
c24c427409
|
braces
|
2017-05-20 08:57:53 -04:00 |
|
Isaac Connor
|
ab365dc749
|
braces
|
2017-05-20 08:53:27 -04:00 |
|
Isaac Connor
|
62bd134277
|
whitespace/braces, also ffmpeg deprecation handling
|
2017-05-20 08:52:24 -04:00 |
|
Isaac Connor
|
3e426b87d3
|
init duration to 0 to quieten compiler
|
2017-05-20 08:35:06 -04:00 |
|
Isaac Connor
|
1ab8530aed
|
use enum values to make code more readable. Better error message on event insertion failure
|
2017-05-20 08:34:46 -04:00 |
|
Isaac Connor
|
7ecbcd8f12
|
code documentation
|
2017-05-20 08:26:55 -04:00 |
|
Isaac Connor
|
53abc14143
|
handle ffmpeg deprecations
|
2017-05-20 08:22:08 -04:00 |
|
Isaac Connor
|
7970b806e0
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-20 07:57:03 -04:00 |
|
Isaac Connor
|
b3e5d6f1c6
|
update to SA
|
2017-05-19 15:15:33 -04:00 |
|
Isaac Connor
|
13273cb50f
|
rmeove unneeded include
|
2017-05-19 15:13:42 -04:00 |
|
Isaac Connor
|
7caeee6bf8
|
Merge branch 'master' into storageareas
|
2017-05-19 15:09:44 -04:00 |
|
Isaac Connor
|
afb450573d
|
fix
|
2017-05-19 15:08:04 -04:00 |
|
Isaac Connor
|
e7ca892efd
|
merge more differences from SA
|
2017-05-19 15:07:41 -04:00 |
|
Isaac Connor
|
91138ba8a1
|
Merge branch 'master' into storageareas
|
2017-05-19 14:53:08 -04:00 |
|
Isaac Connor
|
44e5b6f829
|
remove redundant code
|
2017-05-19 14:52:45 -04:00 |
|
Isaac Connor
|
9e54efdfcf
|
Merge branch 'master' into storageareas
|
2017-05-19 14:49:25 -04:00 |
|
Isaac Connor
|
92c5319fdf
|
add missing video_file
|
2017-05-19 14:43:59 -04:00 |
|
Isaac Connor
|
7c889add76
|
cleanup sql to load event data. Don't need MonitorName
|
2017-05-19 14:43:49 -04:00 |
|
Isaac Connor
|
764c76f98a
|
add loading the video filename when loading event data
|
2017-05-19 14:29:08 -04:00 |
|
Isaac Connor
|
e79d2c5a00
|
Merge branch 'master' into storageareas
|
2017-05-19 14:26:28 -04:00 |
|
Isaac Connor
|
7dccbac78d
|
clenaup
|
2017-05-19 14:25:44 -04:00 |
|
Isaac Connor
|
ccc9f6fdf6
|
remove redundant code
|
2017-05-19 14:24:49 -04:00 |
|
Isaac Connor
|
61204a8b83
|
Merge branch 'master' into storageareas
|
2017-05-19 14:11:29 -04:00 |
|
Isaac Connor
|
41cf0a2458
|
add back analysis fps
|
2017-05-19 14:05:24 -04:00 |