ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,576 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

6576 Commits

Author SHA1 Message Date
Isaac Connor 5a0218778c put back some text 2016-04-06 10:50:33 -04:00
Isaac Connor 2f1376950a spelling fix 2016-04-06 10:50:12 -04:00
Isaac Connor 9aeba8ced8 whitespace fixes 2016-04-06 10:50:00 -04:00
Isaac Connor 0ef02287dd revert 2016-04-06 10:49:42 -04:00
Andrew Bauer ad13d889fe bump version from 1.29.0 to 1.29.1 2016-04-06 09:30:47 -05:00
Isaac Connor 222f7755fe fix whitespace 2016-04-06 10:27:41 -04:00
Andrew Bauer 92d1963b1d Merge pull request #1399 from ZoneMinder/deprecate_autotools_distro_builds 
remove autotools builds, replace them with cmake versions
 2016-04-06 08:36:28 -05:00
Isaac Connor 3e5a4b6481 remove autotools builds, replace them with cmake versions 2016-04-06 08:43:20 -04:00
Isaac Connor b4b622668c fix merge 2016-04-06 08:39:47 -04:00
Isaac Connor 30d2b475eb increase log level on some success debug statements 2016-04-06 08:39:33 -04:00
Isaac Connor a92764f71a check return codes and report errors when writing trailer and closing file 2016-04-06 08:39:09 -04:00
Isaac Connor dd408cc9a1 Don't skip audo stream detection by finding video stream 2016-04-06 08:38:34 -04:00
Isaac Connor 4bc200f839 fix merge 2016-04-06 08:38:10 -04:00
Isaac Connor 9d9369db6f Don't skip audio stream by finding a video stream 2016-04-06 08:37:28 -04:00
Andrew Bauer 9c5b47404d Update CMakeLists.txt 2016-04-06 06:45:21 -05:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor bd5ca575ed Merge branch 'iconnor_video' of github.com:ZoneMinder/ZoneMinder into iconnor_video 2016-04-05 12:31:07 -04:00
Isaac Connor 04800afaf5 Some documenting comments and debug lines, mostly just trying to understand what the code does 2016-04-05 12:30:22 -04:00
Isaac Connor f73d8be765 Merge branch 'master' into feature-h264-videostorage 2016-04-05 09:43:34 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
Isaac Connor 87088d95ac change error to Warning... it is possible to not have any filters returned 2016-04-05 09:22:36 -04:00
Isaac Connor 0f1a530891 ciontrol files need spaces on multi-line lines 2016-04-05 09:03:37 -04:00
Isaac Connor f1331df4d9 Use != instead of == when checking dts tiemscale stuff 2016-04-05 09:01:54 -04:00
Andrew Bauer d6a8d53b75 Merge pull request #1285 from SteveGilvarry/TravisUpdate 
Travis update to Trusty, add Clang build and up ffmpeg version
 2016-04-05 07:33:26 -05:00
Steve Gilvarry 08661550d0 Merge pull request #1392 from SteveGilvarry/feature-h264-videostorage 
Merge master to feature-h264-videostorage
 2016-04-05 22:23:12 +10:00
SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am
 2016-04-05 22:06:14 +10:00
Isaac Connor be13e56c3c add some comments 2016-04-04 21:58:16 -04:00
Andrew Bauer a0e6c004a2 Merge pull request #1388 from ZoneMinder/reload_stream_on_error 
try to reload the image stream on error.
 2016-04-04 20:57:48 -05:00
Andy Bauer 1f62982bac Merge branch 'SteveGilvarry-Autotools_delete' 2016-04-04 20:54:52 -05:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andy Bauer 96d4d119cd Merge branch 'SteveGilvarry-depracation_nation' 2016-04-04 20:45:30 -05:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Andrew Bauer 7cbccf74bc Merge pull request #1389 from ZoneMinder/larger_pid 
Larger pid
 2016-04-04 20:33:05 -05:00
Andrew Bauer ab6758de45 Merge pull request #1387 from ZoneMinder/reload_stream_on_scale 
reload stream on scale change
 2016-04-04 20:32:53 -05:00
Andrew Bauer 1ff84cf94a Merge pull request #1385 from ZoneMinder/remove_local_zm_conf_override 
Remove the code looks for zm.conf in the current dir.
 2016-04-04 20:29:50 -05:00
Isaac Connor a60a0959fc fix SQL for inserting event. output the sql on error 2016-04-04 17:41:06 -04:00
Isaac Connor 6c8e8368e1 rtsp should be lower case 2016-04-04 16:56:54 -04:00
Isaac Connor de5b9c6dae I don't know what the Name of an event is, but the column count and value count are off 2016-04-04 16:56:40 -04:00
Isaac Connor 564f189416 Merge branch 'always_show_ptz' into storageareas 2016-04-04 16:45:54 -04:00
Isaac Connor 868e5a51fa Rename some of the columns names when laoding Control settings as they conflict with Monitor columns 2016-04-04 16:44:21 -04:00
Isaac Connor 711343a5cc fix ZM_SERVER_ID instead of ZM_SERVER 2016-04-04 16:34:21 -04:00
Isaac Connor ec6782a663 fix ZM_SERVER_ID instead of ZM_SERVER 2016-04-04 16:33:46 -04:00
Isaac Connor dd7f399959 Merge branch 'remove_local_zm_conf_override' into storageareas 2016-04-04 16:13:44 -04:00
Isaac Connor 6c92c0e3f7 Merge branch 'reload_stream_on_scale' into storageareas 2016-04-04 16:13:35 -04:00
Isaac Connor 98fce7c3c6 Merge branch 'reload_stream_on_error' into storageareas 2016-04-04 16:13:26 -04:00
Isaac Connor bc9760ce79 Merge branch 'master' into storageareas 2016-04-04 16:13:17 -04:00
Isaac Connor 397eb1a01b increase the size of the Pid field in Logs to accomodate FreeBSD 2016-04-04 15:14:42 -04:00
Isaac Connor ed74168710 increase the size of the Pid field in Logs to accomodate FreeBSD 2016-04-04 15:14:14 -04:00
Isaac Connor 123a1a898a try to reload the image stream on error. 2016-04-04 15:04:09 -04:00