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

3354 Commits

Author SHA1 Message Date
Andrew Bauer 49e4d1089a Update zoneminder.cmake.el6.spec 
Bugfix. Perl path was hardcoded to x86_64. Use macro instead.
 2013-12-16 14:42:22 -06:00
Kyle Johnson 263f3a6e02 Merge pull request #269 from knnniggett/zmupdate_1.26.5 
Automatically grab all sql scripts in the db subfolder
 2013-12-16 07:42:36 -08:00
Andrew Bauer e68fd9db91 Automatically grab all sql scripts in the db subfolder 2013-12-14 09:45:18 -06:00
Andrew Bauer 8d2dac67b3 Update zoneminder.in 2013-12-14 09:14:44 -06:00
Andrew Bauer b0b471eb5b Update zm.in 2013-12-14 09:13:49 -06:00
Andrew Bauer cd43496a7d Update zm.in 
Don't think this is needed.  This may contribute to the corrupt Config table issue
 2013-12-14 09:05:15 -06:00
Andrew Bauer 8265eb98dc Add reference to zm_update-1.26.5.sql in Makefile.am 2013-12-13 18:51:39 -06:00
Kyle Johnson 0667795acf Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-12-13 13:54:42 -05:00
Isaac Connor 6a047a947a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-12-13 13:46:11 -05:00
Isaac Connor 73dbe81064 update to 1.26.5 2013-12-13 13:45:55 -05:00
Kyle Johnson dc0d305811 Bump version to 1.26.5 2013-12-13 13:39:23 -05:00
Kyle Johnson c3c3cfbfb9 Merge pull request #264 from ZoneMinder/improvezmpkg 
Use proper DBI parameter passing in zmpkg.pl to improve security
 2013-12-13 10:34:48 -08:00
Kyle Johnson f39f2fab66 Merge pull request #241 from ZoneMinder/alarmrefblendoption 
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
 2013-12-13 10:13:34 -08:00
Kyle Johnson 45ad839f96 Merge pull request #259 from ebarnard/rtsp-fix 
Regression:  Fix RTSP decoding errors in 1.26.4 fixes #221
 2013-12-13 10:12:50 -08:00
Kfir Itzhak ca3a7c1732 Merge pull request #268 from Phhere/patch-3 
Improve detection for WansView cameras
 2013-12-11 15:21:10 -08:00
Philipp Rehs 529c124a9c Detection Support for WansView Cams 
Support for detection of Wansview Cams which are connected by lan
 2013-12-11 11:29:30 +01:00
Kfir Itzhak e9f4479171 Added support for UYVY capture palette (required for some Bluecherry cards) 2013-12-10 15:13:48 +02:00
Edward Barnard c630174868 Adds support for h264 cameras that fail to set m bit for end of fragmented frames. 2013-12-07 11:21:10 +00:00
Isaac Connor 2775752a41 use proper DBI parameter passing to improve security 
remark out call to zmupdate.pl -f
 2013-12-06 16:46:21 -05:00
Kfir Itzhak 5a256eb96f Merge pull request #256 from Phhere/patch-1 
Fix checkJsonError messages
 2013-12-04 04:58:39 -08:00
Edward Barnard 9a06ec51c6 Save a couple of cpu cycles. 2013-12-02 15:37:26 +00:00
Kfir Itzhak 219ada85c0 Merge pull request #257 from Phhere/patch-2 
Network Detection Support for Wansview
 2013-12-01 16:04:56 -08:00
Kfir Itzhak 23ff4023bd Removed installation of web/README.md from cmake 2013-12-02 01:53:21 +02:00
Kfir Itzhak 783bf4b8ab Fixed web/skins/*/includes/config.php not being installed 2013-12-02 01:52:26 +02:00
Edward Barnard 5d9dcba2d8 Adds support more H264 NAL types and tidies function 2013-11-30 22:00:52 +00:00
Edward Barnard 21946b5854 H264 SPS and PPS frames are now handled correctly 2013-11-30 21:59:04 +00:00
Philipp Rehs 55dadcf758 Network Detection Support for Wansview 
Basis support for Wansview Cams
Tested with NC541W
 2013-11-30 20:46:59 +01:00
Philipp Rehs d4babd23f1 Fix checkJsonError messages 
The $value string was not set inside checkJsonError, so it was not possible to see the data which caused the error
 2013-11-30 18:13:02 +01:00
Edward Barnard 80d172efa1 The last packet of a fragmented mpeg4 frame is no longer rejected. 2013-11-29 16:15:56 +00:00
Edward Barnard 3665c3ee3a Fixed bug in mpeg4 depacketizer and RTCP implementation. 2013-11-28 23:07:46 +00:00
Edward Barnard 560d9bd809 RtpSource can now distinguish between payload types and handles some properly. 2013-11-28 21:32:06 +00:00
Andrew Bauer d0debfa450 Update zoneminder.in 
The freshen database feature does not appear to be necessary and may even corrupt the dB under certain conditions. Commenting out.
 2013-11-26 15:21:28 -06:00
Kfir Itzhak d50169c383 Added SWScale wrapper class and FFMPEG PixelFormat match function 2013-11-26 16:34:26 +02:00
Kfir Itzhak 88f2bc6b63 Fix zmc crashing on shutdown (for remote http cameras) caused by content_length sign mess 2013-11-24 15:37:47 +02:00
Kfir Itzhak 55ea6745f1 Revert "Correctly fix mootools symlinks being installed twice in cmake this time" 
This reverts commit 89689d8f3f.
 2013-11-22 23:50:59 +02:00
Kfir Itzhak 89689d8f3f Correctly fix mootools symlinks being installed twice in cmake this time 2013-11-22 20:23:58 +02:00
Isaac Connor 729f0364df Merge pull request #255 from zdanek/master 
Update README.md
 2013-11-22 08:52:39 -08:00
Kfir Itzhak eff58367b4 IPv6 improvements 2013-11-22 15:30:05 +02:00
Bartek Zdanowski f6dca0f575 Fixing bug that stops installation/upgrade if DB is already at current version 2013-11-20 10:39:51 +01:00
Bartek Zdanowski d223303d28 Update README.md 
fixed symlink problem
 2013-11-19 21:35:12 +01:00
Isaac Connor 4555a8bf92 Merge pull request #240 from ZoneMinder/postinstcleanup 
remove extra stuff that I don't think we need because we are the source.
 2013-11-19 08:29:51 -08:00
Kfir Itzhak 6a23a051c6 Merge pull request #252 from guotie/master 
ipv6 support to http remote camera code
 2013-11-19 06:27:20 -08:00
Kfir Itzhak 17129cf078 Fix minor bug introduced by commit cfc9a73851: Do not install mootools symlinks twice for out-of-source installations 2013-11-17 15:15:54 +02:00
Kfir Itzhak 56d3c7504a Put CMAKE_INCLUDE_CURRENT_DIR back in 2013-11-17 15:10:35 +02:00
Kfir Itzhak bed30d32b6 Remove round() mess 2013-11-15 11:41:26 +02:00
Kfir Itzhak 762e63653c Few minor cmake improvements, especially for whitespaces in paths 2013-11-15 11:12:33 +02:00
Kfir Itzhak 4a4018b8d7 Add automatic finding of the ffmpeg executable to cmake 2013-11-15 11:11:33 +02:00
Kfir Itzhak 82a92639ca Remove importing of binary directory in cmakecacheimport.sh 2013-11-15 10:44:31 +02:00
Kyle Johnson b7aa85ea79 Merge pull request #251 from ZoneMinder/betterInnoDBupdate 
InnoDB upgrae and DB connection improvements to zmupdate.pl
 2013-11-14 11:57:27 -08:00
Isaac Connor 7da2cdd159 cleanups, only connect and disconnect once. Remove unncessary require's of DBI 
cleanup MyISAM to InnoDB code
 2013-11-13 11:45:53 -05:00