Commit Graph

4580 Commits

Author SHA1 Message Date
Andrew Bauer 72da7a0e69 process redhat subfolder when EL7 is specified 2015-02-08 16:37:29 -06:00
Andrew Bauer 9bc28c96f0 Centos 7 rpm packaging 2015-02-08 16:16:31 -06:00
Andrew Bauer 8eccc2ff9d Update INSTALL
Update cmake INSTALL documentation
2015-02-08 11:30:18 -06:00
Andrew Bauer 547cb5c611 Merge pull request #699 from clipo1979/master
tmpfile.conf for systemd
2015-02-08 11:20:20 -06:00
clipo1979 0c257405b0 Update Makefile.am 2015-02-08 16:22:19 +00:00
clipo1979 33fef42233 Update zoneminder-tmpfiles.conf.in 2015-02-08 16:11:07 +00:00
clipo1979 6c86811ff0 Update CMakeLists.txt 2015-02-08 13:09:01 +00:00
clipo1979 efa760a3fa Create zoneminder-tmpfiles.conf.in 2015-02-08 13:07:53 +00:00
Isaac Connor 4524a61a50 prevent error message in log when Enabled is not checked 2015-02-06 14:15:26 -05:00
Isaac Connor fed6748c6d fixes to format date into zero padding and year as 2 digit 2015-02-06 13:00:55 -05:00
Isaac Connor dbac099223 we don't use EndTime so don't load it 2015-02-06 11:50:23 -05:00
Isaac Connor bcdac0104f pass a minimum event hash instead of the event id to deleteEvent 2015-02-06 11:50:07 -05:00
Isaac Connor 9a1e210849 add comment 2015-02-06 11:46:35 -05:00
Isaac Connor 02a6c78182 make deleteEvent take either an event object or an eid.
load the relevant event data if passed an eid.
Use the StartTime to get to the event files instead of globbing the entire events path under the monitor.
2015-02-06 11:41:37 -05:00
Isaac Connor 856a8ce1d0 minor improvement removing 1 coll to time()
improve logging tell which monitor the event belonged to
2015-02-06 09:30:48 -05:00
Isaac Connor 60d92d6a59 Add a check for librt which is needed on pi 2015-02-05 11:03:37 -05:00
Isaac Connor 4613fd46a4 fix a reorder warning 2015-02-05 11:03:26 -05:00
Andrew Bauer 92b3cdbadb Merge pull request #691 from ZoneMinder/rtsp_auth_fixes
this fixes Digest Auth for the mjpeg stream on a TV-IP302PI
2015-02-04 13:46:37 -06:00
Andrew Bauer eb18e27e44 Merge pull request #692 from ZoneMinder/contenttype_parsing_fix
fix content-type parsing when there are options on it
2015-02-04 13:41:45 -06:00
Isaac Connor 65701f0956 add missing + 2015-02-04 14:22:53 -05:00
Isaac Connor 4c7e8592d0 fix content-type parsing when there are options on it 2015-02-04 13:53:42 -05:00
Isaac Connor b22608fb07 this fixes Digest Auth for the mjpeg stream on a TV-IP302PI
Digest Auth worked for the RTSP stream, but not http.
This adds quotes around the cnonce value, which matches what curl and wget do and adds the algorithm line which also matches what curl and wget do.  With these two changes the auth is accepted.
2015-02-04 13:50:19 -05:00
Isaac Connor 20fec3ed7a According perldoc DBI we should NOT be calling finish after processing all rows. 2015-02-04 11:15:31 -05:00
Isaac Connor 1abe35c576 change Debug level of this line to something higher 2015-02-03 14:33:23 -05:00
Isaac Connor 2b00ebd02c if path results in an empty string, set it to something so that the link is there when type is vlc 2015-02-03 10:52:49 -05:00
Isaac Connor d2865f625b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-02-02 19:06:57 -05:00
Isaac Connor bf688f2d39 trival quoting changes and missing semi colons 2015-02-02 19:06:45 -05:00
Isaac Connor 690a2f083e fix montage layout broken by my skin merging 2015-02-02 19:06:20 -05:00
Andrew Bauer 82af43f5fb process RTSP DESCRIBE response header 2015-01-31 08:31:27 -06:00
Isaac Connor c2d429aae0 Add some comments, change log level of some debug lines. Don't die on a timeout. 2015-01-30 09:44:10 -05:00
Isaac Connor 7e685bb04a Merge pull request #675 from ZoneMinder/small_performance_improvement
small performance improvement when streaming.
2015-01-29 16:27:34 -05:00
Isaac Connor da54867ea2 better log message, trivial 2015-01-29 16:21:43 -05:00
Isaac Connor 9d636ad128 fix zms crash due to buffer_copy_size never being initialized 2015-01-29 15:32:50 -05:00
Isaac Connor 2328ae8792 remove 50% width so that header auto-fits 2015-01-28 14:05:29 -05:00
Isaac Connor 321196e206 fix to reset timeout flag upon receiving something 2015-01-28 14:04:31 -05:00
Emmanuel Papin e7b1ab54df Merge branch 'master' into plugin_support 2015-01-28 19:09:14 +01:00
Isaac Connor b97f2fa4f6 Send an RTCP RR packet when we get a timeout to see if we are really dead. 2015-01-28 12:36:11 -05:00
Isaac Connor 56c82cfbb5 Save 1 or more calls to time(NULL) 2015-01-28 12:33:05 -05:00
Emmanuel Papin bfef99fc6f Do not delete the monitor directory in event path, this introduces so much troubles... 2015-01-27 21:11:00 +01:00
Emmanuel Papin 7c0dfe9a5b Merge branch 'plugin_support_new' into plugin_support
Conflicts:
	distros/debian8/changelog
2015-01-27 19:28:42 +01:00
Emmanuel Papin 4bbf1439bb Update debian changelog file 2015-01-27 19:24:50 +01:00
Emmanuel Papin cd16b7168e Merge branch 'master' into plugin_support
Conflicts:
	distros/debian8/changelog
2015-01-27 19:22:06 +01:00
Emmanuel Papin 9360837d38 Add a DeleteEvent function to Event cpp class 2015-01-26 21:13:05 +01:00
Emmanuel Papin 35ed0b475c Move a global static declaration to main binary source files. Yes this duplicates coding lines, but this allows to load plugins without destroying the variable allocation in zm binaries. 2015-01-26 20:12:20 +01:00
Isaac Connor 8e85338eca Merge pull request #646 from manupap1/debian_package_split
Split the debian package into several packages
2015-01-26 11:09:33 -05:00
Andrew Bauer 987f98152a Update INSTALL 2015-01-24 13:54:29 -06:00
Isaac Connor d9302ce345 Merge pull request #665 from knnniggett/rtp_ctrl
Don't fail if an unexpected rtp packet type is received
2015-01-23 16:19:01 -05:00
Emmanuel Papin a7b912b1b5 Fix call to onCloseEvent 2015-01-17 21:54:47 +01:00
Emmanuel Papin 7906307580 Fix compilation errors 2015-01-17 19:04:20 +01:00
Emmanuel Papin 53c8a3073f Update debian changelog file 2015-01-17 18:41:18 +01:00