Commit Graph

4664 Commits

Author SHA1 Message Date
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
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
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 279459bf2c Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split 2015-01-15 21:35:52 +01:00
Emmanuel Papin c6c4e70a36 Switch debian8 folder to native source format 2015-01-15 21:32:01 +01:00
Andrew Bauer d8df44fefe Update INSTALL 2015-01-14 21:42:18 -06:00
Isaac Connor facda38871 add corresponding free 2015-01-13 19:52:15 -05:00
Isaac Connor 509de3ec27 need to cast malloc, get rid of perl code, only swap_path checks if we are going to use it 2015-01-13 15:16:38 -05:00
Andrew Bauer 44606942fa Rename zoneminder.cmake.f20.spec to zoneminder.f20.spec 2015-01-13 08:17:42 -06:00
Andrew Bauer 010fd69b0b Rename zoneminder.cmake.el6.spec to zoneminder.el6.spec 2015-01-13 08:17:20 -06:00
Andrew Bauer 7c99886af2 Update zoneminder.cmake.el6.spec
net-tools is the package that contains the arp command.
2015-01-13 08:16:05 -06:00
Andrew Bauer 3b418bb455 Update zoneminder.cmake.f20.spec
net-tools is the package that contains the arp command
2015-01-13 08:15:02 -06:00
Emmanuel Papin 47ef5c999f Add dependency to apache2 for zoneminder-core package 2015-01-12 22:22:40 +01:00
Emmanuel Papin f05dc5e2a3 Rename debian patch 2015-01-12 21:03:29 +01:00
Emmanuel Papin e1824aad4b Fix a conflict when merging upstream master 2015-01-12 20:52:14 +01:00
Emmanuel Papin 0650ca1de0 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
Conflicts:
	distros/debian8/patches/01_vendor-perl.diff
	distros/debian8/patches/series
2015-01-12 20:48:59 +01:00
Andrew Bauer f1fa8a3d92 fix typo 2015-01-08 12:48:19 -06:00
Andrew Bauer d787ad3f7a Merge pull request #666 from ZoneMinder/kill_zmcontrol
Kill zmcontrol
2015-01-07 17:28:08 -06:00
Andrew Bauer 53244aff0d Don't fail if an unexpected rtp packet type is received 2015-01-07 16:01:38 -06:00
Isaac Connor 74929236e3 put the sendControlCommand(quit) into the right place 2015-01-07 16:56:10 -05:00
Isaac Connor 21ccb9b91a introduce the quit command which makes the resident zmcontrol.pl exit 2015-01-07 16:37:26 -05:00
Isaac Connor d0138af00c use new sendControlCommand function to send normal commands as well as send the quit command on monitor edit. 2015-01-07 16:24:34 -05:00
Isaac Connor 2e48c2ba3d add sendControlCommand function to do the heavy work of sending zmcontrol a command 2015-01-07 16:24:07 -05:00
Andrew Bauer 2f5abfbb13 Merge pull request #664 from ZoneMinder/versions
Versions command line args
2015-01-07 08:50:42 -06:00
Isaac Connor a10f2aa31c Add version to the usage line in zmx10.pl 2015-01-07 09:14:00 -05:00
Isaac Connor 7f934e0e69 Add version to the usage line in zmvideo.pl 2015-01-07 09:11:07 -05:00
Isaac Connor 5b79139a05 Add version to the usage line in zmsystemctl.pl 2015-01-07 09:07:40 -05:00
Isaac Connor 3013d87783 Add -v --version command line param to zmpkg.pl 2015-01-07 09:05:16 -05:00
Isaac Connor 8ea01e631b Add -v --version command line param to zmfilter.pl 2015-01-07 09:00:46 -05:00
Isaac Connor 94e0ec542a Add -v --version command line param to zmdc.pl 2015-01-07 08:47:32 -05:00
Isaac Connor 76d0dfa475 Add -v --version command line param to zmcamtool.pl 2015-01-07 08:43:51 -05:00
Isaac Connor 71c94475ff Add -v --version command line parameters to zmaudit.pl 2015-01-06 21:08:41 -05:00
Isaac Connor 1adb147899 add version command line argument to zmstreamer. Also add -h for consistency with other programs 2015-01-06 20:59:03 -05:00
Isaac Connor 258c97f75f add version command line argument to zmf 2015-01-06 20:54:49 -05:00
Isaac Connor 85e51528a6 add version command line argument to zma 2015-01-06 20:52:18 -05:00
Isaac Connor 6f42f1c6d8 add version command line argument to zmc 2015-01-06 20:49:33 -05:00
Andrew Bauer fdb3efab57 Merge pull request #662 from hanzese/patch-2
Update et_ee.php
2015-01-06 13:13:22 -06:00
Hannes 4508c541ef Update et_ee.php
Fixing Some problems 
Parse error: syntax error, unexpected 'Parameters' (T_STRING) in /usr/share/zoneminder/lang/et_ee.php
2015-01-06 17:10:58 +02:00