5f1b084cc5
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 14:27:07 -04:00
655839e56a
Allow NULLS in various fields
2017-05-23 14:20:19 -04:00
433515dba9
Allow NULLS in LinkedMonitors
2017-05-23 14:14:24 -04:00
b828f0501c
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 14:07:19 -04:00
739d1e5304
Add lines to Convert db to allow NULLS
2017-05-23 14:07:10 -04:00
4347ee1258
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 10:41:40 -04:00
13265a8f4f
undo StorageAreas contents
2017-05-23 10:41:21 -04:00
efa29b6a64
Merge pull request #1891 from SteveGilvarry/master
...
Revert h264 README.md changes again.......................
2017-05-23 20:27:00 +10:00
55df858ded
Revert h264 README.md changes again.......................
2017-05-23 20:25:36 +10:00
75dc774a08
Continue to support non-USE_DEEP_STORAGE option
2017-05-22 21:21:49 -04:00
dbf83831ff
merge from SA. Adds the ability to pass in additional options when connecting
2017-05-20 10:32:41 -04:00
d76d65f475
merge from SA, includes StorageAreas support
2017-05-20 10:32:04 -04:00
54c9c37b21
Merge ../ZoneMinder.connortechnology
2017-05-20 09:55:06 -04:00
03495e8c23
fix
2017-05-20 09:54:03 -04:00
bb50784ed2
braces
2017-05-20 09:53:35 -04:00
0da03ca5e8
braces/whitespace
2017-05-20 09:41:13 -04:00
23633ce30b
braces
2017-05-20 09:06:12 -04:00
a5ee8307d0
Merge ../ZoneMinder.connortechnology
2017-05-20 09:03:57 -04:00
457d7e5c94
code documentation, whitespace
2017-05-20 09:03:51 -04:00
6ec5a18a35
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-05-20 09:03:09 -04:00
dba947346a
braces
2017-05-20 09:03:04 -04:00
381d44439a
merge SA. braces/whitespace debugging
2017-05-20 09:01:32 -04:00
c24c427409
braces
2017-05-20 08:57:53 -04:00
ab365dc749
braces
2017-05-20 08:53:27 -04:00
62bd134277
whitespace/braces, also ffmpeg deprecation handling
2017-05-20 08:52:24 -04:00
3e426b87d3
init duration to 0 to quieten compiler
2017-05-20 08:35:06 -04:00
1ab8530aed
use enum values to make code more readable. Better error message on event insertion failure
2017-05-20 08:34:46 -04:00
7ecbcd8f12
code documentation
2017-05-20 08:26:55 -04:00
7970b806e0
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-20 07:57:03 -04:00
b3e5d6f1c6
update to SA
2017-05-19 15:15:33 -04:00
e7ca892efd
merge more differences from SA
2017-05-19 15:07:41 -04:00
44e5b6f829
remove redundant code
2017-05-19 14:52:45 -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
ccc9f6fdf6
remove redundant code
2017-05-19 14:24:49 -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
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
6d6b453b82
Google code style/whitespace
2017-05-19 12:57:43 -04:00
64070daca6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 12:25:37 -04:00
0a8017b780
whitespace/google code style
2017-05-19 12:24:19 -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
Isaac Connor
Isaac Connor
Steve Gilvarry