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

6513 Commits

Author SHA1 Message Date
Andrew Bauer 176220f1bf Update version 
Bumping back to 1.29.0
Note to all: We need to remember to bump this at the moment we create our next release
 2016-04-08 07:44:30 -05:00
Isaac Connor e473839704 substitute ZM_DB_NAME,ZM_DB_USER and ZM_DB_PASS from zm.conf for defaults 2016-04-06 15:50:51 -04:00
Isaac Connor 3dd010b40a User and and instead of defaults 2016-04-06 15:44:56 -04:00
Isaac Connor 6cdbcfc9e6 add back identified by 2016-04-06 13:55:18 -04:00
Isaac Connor 6199a54838 more work, check for local db, check for existence of mysql, sync up between debian ubuntu1204 ubuntu1504 2016-04-06 13:45:46 -04:00
Isaac Connor 699b6458d5 bring up to date with debian postinst. Will not install the db, create the user and will run zmupdate. 2016-04-06 13:08:30 -04:00
Isaac Connor cf76360ecb bring up to date with the one in debian 2016-04-06 13:03:24 -04:00
Isaac Connor fb05e1baad grant requires rights regardless of password 2016-04-06 13:01:20 -04:00
Isaac Connor fefa2dc804 add a test and error message if the codec is not h264 2016-04-06 12:48:16 -04:00
Isaac Connor 97974bb017 Merge branch 'master' into icon_video 2016-04-06 12:33:25 -04:00
Isaac Connor e3fffddb21 Merge branch 'master' into feature-h264-videostorage 2016-04-06 12:33:03 -04:00
Isaac Connor 7645e29913 fix distro dirs, because the cmake versions have been renamed to not have cmake in them 2016-04-06 12:27:24 -04:00
Isaac Connor 3085e8b7a2 Merge branch 'master' into feature-h264-videostorage 2016-04-06 11:55:20 -04:00
Isaac Connor 709fc35167 Merge branch 'master' into icon_video 2016-04-06 11:49:40 -04:00
Isaac Connor d83ab4d46c Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines 2016-04-06 11:25:05 -04:00
Isaac Connor e0529c9dd7 Merge pull request #1400 from knnniggett/bump1.29.1 
bump version from 1.29.0 to 1.29.1
 2016-04-06 11:19:59 -04:00
Isaac Connor 7491aa4381 fix spelling mistake 2016-04-06 10:55:11 -04:00
Isaac Connor 45f61b503b add these back 2016-04-06 10:53:28 -04:00
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
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 f73d8be765 Merge branch 'master' into feature-h264-videostorage 2016-04-05 09:43:34 -04:00
Isaac Connor 0f1a530891 ciontrol files need spaces on multi-line lines 2016-04-05 09:03:37 -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
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 711343a5cc fix ZM_SERVER_ID instead of ZM_SERVER 2016-04-04 16:34:21 -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
Isaac Connor 0b13f9d76f reload stream on scale change 2016-04-04 14:58:07 -04:00
Isaac Connor 02eb36040a fix bad code 2016-04-04 12:01:37 -04:00
Isaac Connor a31660c1f6 Remove the code looks for zm.conf in the current dir. 2016-04-04 10:45:58 -04:00
Isaac Connor c8fa0a9b4f Merge branch 'master' into feature-h264-videostorage 2016-04-04 10:14:15 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00