Commit Graph

3329 Commits

Author SHA1 Message Date
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
Kfir Itzhak 91d42a86cf Merge branch 'cmakemootoolsfix' 2013-11-13 16:59:46 +02:00
Kfir Itzhak 47179f793d Fix make install failing to install mootools symlinks in an out-of-source build 2013-11-13 16:52:01 +02:00
Isaac Connor 29e2cdf561 split the innoDB upgrade out of the version section, so that it always checked for MyISAM tables and if found, offers to update them. 2013-11-13 09:42:10 -05:00
Isaac Connor 0f3f680e36 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-11-12 15:41:42 -05:00
Isaac Connor 10dd0e15fe Merge pull request #250 from insidenothing/master
Fix shared memory errors on centos 6.4
2013-11-12 12:30:25 -08:00
Patrick McGuire 8c0ad352f5 Fix shared memory errors on centos 6.4 2013-11-08 14:53:01 -05:00
Isaac Connor c840f1b622 suggest mysql-server 2013-11-08 12:08:06 -05:00
Isaac Connor 6d6503c006 suggest mysql-server 2013-11-08 12:07:45 -05:00
Kfir Itzhak cfc9a73851 Fixed not installing mootools symlinks in an out-of-source build 2013-11-08 18:54:46 +02:00
Isaac Connor b8f075499b fix for debian bug #725840 Javascript errors in updateButtons function of filter.js
Also a slight optimisation using else's instead of continuing to evaluate after the true value has been set.
2013-11-08 11:47:19 -05:00
Isaac Connor 2cd0d0b405 repeat the dbh package lines for debian as well 2013-11-08 11:25:06 -05:00
Isaac Connor e9c0509399 add rules for a dbg package 2013-11-08 11:09:23 -05:00
Kfir Itzhak 9979385c3b Remove the crashtrace option from configure.ac (autoconf) 2013-11-07 23:35:44 +02:00
Kfir Itzhak c08e4de42e Added the database update file for 1.26.5 with includes the AlarmRefBlendPerc option 2013-11-07 16:29:02 +02:00
Isaac Connor d87709528d fix assigning DB_TYPE 2013-11-06 17:47:23 -05:00
Isaac Connor f4dfd88d9f handle bad config lines better 2013-11-06 17:02:01 -05:00
Isaac Connor fe829e7a4b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-11-06 16:58:23 -05:00
Kyle Johnson 5c369fffff Merge pull request #246 from dtmf/patch-1
Add "After=" rule to prevent ZoneMinder from starting before mysqld (fedora)
2013-11-06 04:40:37 -08:00
Will Scales 82a3f4622f Update zoneminder.service
Added "After=" rule to [unit] section to prevent Zoneminder from starting before mysqld.
2013-11-06 06:30:43 -06:00
Kyle Johnson 2564512d86 Merge pull request #243 from ZoneMinder/zmconfcleanup
Delete PATH_BUILD and TIME_BUILD from zm.conf and fix ZM_DB_TYPE
2013-11-05 09:13:26 -08:00
Kfir Itzhak 90d7ce98f1 Delete PATH_BUILD and TIME_BUILD from zm.conf and setup default for
ZM_DB_TYPE
2013-11-04 22:38:21 +02:00
Kfir Itzhak be21a882ab Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
Kfir Itzhak 891757da74 Merge pull request #232 from josephevans/master
Cast content_length to signed int for error-check comparison
2013-11-04 11:59:44 -08:00