b123bd1da3
remove uneccessary zm_packetqueue.h
2017-05-20 09:12:05 -04:00
40993ce401
braces
2017-05-20 09:11:35 -04:00
53abc14143
handle ffmpeg deprecations
2017-05-20 08:22:08 -04:00
7caeee6bf8
Merge branch 'master' into storageareas
2017-05-19 15:09:44 -04:00
afb450573d
fix
2017-05-19 15:08:04 -04:00
e7ca892efd
merge more differences from SA
2017-05-19 15:07:41 -04:00
91138ba8a1
Merge branch 'master' into storageareas
2017-05-19 14:53:08 -04:00
44e5b6f829
remove redundant code
2017-05-19 14:52:45 -04:00
9e54efdfcf
Merge branch 'master' into storageareas
2017-05-19 14:49:25 -04:00
92c5319fdf
add missing video_file
2017-05-19 14:43:59 -04:00
7c889add76
cleanup sql to load event data. Don't need MonitorName
2017-05-19 14:43:49 -04:00
764c76f98a
add loading the video filename when loading event data
2017-05-19 14:29:08 -04:00
e79d2c5a00
Merge branch 'master' into storageareas
2017-05-19 14:26:28 -04:00
7dccbac78d
clenaup
2017-05-19 14:25:44 -04:00
ccc9f6fdf6
remove redundant code
2017-05-19 14:24:49 -04:00
61204a8b83
Merge branch 'master' into storageareas
2017-05-19 14:11:29 -04:00
41cf0a2458
add back analysis fps
2017-05-19 14:05:24 -04:00
8568c95fbe
handel NULLS in db fields
2017-05-19 14:03:28 -04:00
1e4792e13d
Merge branch 'master' into storageareas
2017-05-19 13:36:23 -04:00
aab08db84b
Merge branch 'master' into storageareas
2017-05-19 13:35:31 -04:00
c4e68f8cfd
fix some spacing problems caused by missing ;
2017-05-19 13:35:13 -04:00
5e2220efa0
add a missing ; at end of line, and remove end of line spaces
2017-05-19 13:30:08 -04:00
3fcca1021d
add missing; and fix spacing
2017-05-19 13:28:34 -04:00
bbb77ab7dd
reorder lines to make diff from master cleaner
2017-05-19 13:27:18 -04:00
96b459a058
Merge branch 'master' into storageareas
2017-05-19 13:19:16 -04:00
6d6b453b82
Google code style/whitespace
2017-05-19 12:57:43 -04:00
e9af81d31c
tabs to spaces
2017-05-19 12:29:03 -04:00
1c9c6441d4
Merge branch 'master' into storageareas
2017-05-19 12:28:07 -04:00
64070daca6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 12:25:37 -04:00
d988b9b6d5
improve efficiency of progress bar updating/drawing. Add some debug
2017-05-19 12:25:26 -04:00
641384f38d
spacing
2017-05-19 12:24:59 -04:00
0a8017b780
whitespace/google code style
2017-05-19 12:24:19 -04:00
f4008e2c6a
Merge branch 'master' into storageareas
2017-05-19 11:20:33 -04:00
9e3af977e2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 11:09:08 -04:00
c64391c98d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 11:00:37 -04:00
94a719f44f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 10:24:06 -04:00
29b43cfd0a
Whitespace, google style, localized video.js ( #1890 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
* Merge updates from sa branch
* Update frmo SA. Use Monitor object, still hide Controls by default.
2017-05-19 10:23:51 -04:00
6f33543fb2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 10:19:10 -04:00
75ca52dba5
fix width of plus and minus buttons in filters
2017-05-19 10:18:52 -04:00
94f7194e4f
Update frmo SA. Use Monitor object, still hide Controls by default.
2017-05-18 21:48:21 -04:00
319712a4c1
Merge updates from sa branch
2017-05-18 15:16:59 -04:00
377cc94acb
Merge more changes to make video storage ui's work ( #1889 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
2017-05-18 15:11:26 -04:00
f851daca68
merge code to load video.js etc on Event view
2017-05-18 15:10:13 -04:00
5500d7bbc0
merge localized versions of js files
2017-05-18 15:05:57 -04:00
bf3db69cbe
merge localized versions of js files
2017-05-18 15:05:10 -04:00
bc1a2dcb21
whitespace & braces
2017-05-18 14:55:53 -04:00
3ccf7e102e
fix Debug to Logger::Debug
2017-05-18 14:50:17 -04:00
57d07aef22
merge whitespace and brace changes from sa branch
2017-05-18 14:44:06 -04:00
2da374bfb1
log the command as well as output and return values
2017-05-18 14:43:17 -04:00
44c07c4e7a
put back proper sql
2017-05-18 14:42:55 -04:00
Isaac Connor
Isaac Connor