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 |
|
Isaac Connor
|
8568c95fbe
|
handel NULLS in db fields
|
2017-05-19 14:03:28 -04:00 |
|
Isaac Connor
|
4dc5f0060f
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2017-05-19 13:49:57 -04:00 |
|
Isaac Connor
|
4e9f93d1a6
|
tabs to spaces, accept lower case y in answers
|
2017-05-19 13:49:12 -04:00 |
|
Isaac Connor
|
1e4792e13d
|
Merge branch 'master' into storageareas
|
2017-05-19 13:36:23 -04:00 |
|
Isaac Connor
|
aab08db84b
|
Merge branch 'master' into storageareas
|
2017-05-19 13:35:31 -04:00 |
|
Isaac Connor
|
c4e68f8cfd
|
fix some spacing problems caused by missing ;
|
2017-05-19 13:35:13 -04:00 |
|
Isaac Connor
|
5e2220efa0
|
add a missing ; at end of line, and remove end of line spaces
|
2017-05-19 13:30:08 -04:00 |
|
Isaac Connor
|
3fcca1021d
|
add missing; and fix spacing
|
2017-05-19 13:28:34 -04:00 |
|
Isaac Connor
|
bbb77ab7dd
|
reorder lines to make diff from master cleaner
|
2017-05-19 13:27:18 -04:00 |
|
Isaac Connor
|
96b459a058
|
Merge branch 'master' into storageareas
|
2017-05-19 13:19:16 -04:00 |
|
Isaac Connor
|
6d6b453b82
|
Google code style/whitespace
|
2017-05-19 12:57:43 -04:00 |
|
Isaac Connor
|
e9af81d31c
|
tabs to spaces
|
2017-05-19 12:29:03 -04:00 |
|
Isaac Connor
|
1c9c6441d4
|
Merge branch 'master' into storageareas
|
2017-05-19 12:28:07 -04:00 |
|
Isaac Connor
|
64070daca6
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-19 12:25:37 -04:00 |
|
Isaac Connor
|
d988b9b6d5
|
improve efficiency of progress bar updating/drawing. Add some debug
|
2017-05-19 12:25:26 -04:00 |
|
Isaac Connor
|
641384f38d
|
spacing
|
2017-05-19 12:24:59 -04:00 |
|
Isaac Connor
|
0a8017b780
|
whitespace/google code style
|
2017-05-19 12:24:19 -04:00 |
|
Isaac Connor
|
f4008e2c6a
|
Merge branch 'master' into storageareas
|
2017-05-19 11:20:33 -04:00 |
|
Isaac Connor
|
9e3af977e2
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-19 11:09:08 -04:00 |
|
Isaac Connor
|
c64391c98d
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-19 11:00:37 -04:00 |
|
Isaac Connor
|
94a719f44f
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-19 10:24:06 -04:00 |