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

1025 Commits

Author SHA1 Message Date
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
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 70a062a609 Remove image argument in new functions 2015-01-17 18:30:24 +01:00
Emmanuel Papin 2227d9c852 Add new fuctions for plugins 2015-01-15 16:51:46 +01:00
Emmanuel Papin b5ab290e78 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support 
Conflicts:
	web/lang/et_ee.php
 2015-01-10 17:47:30 +01: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
Emmanuel Papin 72d1581f44 Display plugins with zmu even if plugin loading is not enabled 2015-01-04 14:44:43 +01:00
Emmanuel Papin f551b50ec0 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support 
Conflicts:
	distros/debian8/patches/01_vendor-perl.diff
	distros/debian8/patches/series
 2015-01-04 12:23:29 +01:00
Isaac Connor 56b1a50b2b revert 2015-01-03 14:07:18 -05:00
Isaac Connor af570259d1 got these swapped, should be the other way around 2015-01-03 13:59:23 -05:00
Isaac Connor 14c65aefd2 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 
Conflicts:
	src/zm_comms.cpp
 2015-01-03 13:56:40 -05:00
Emmanuel Papin 7fc359e940 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support 2015-01-03 13:46:41 +01:00
Isaac Connor e02da8833a ifdef's for BSD 2015-01-02 17:08:51 -05:00
Isaac Connor 92e6d940bc ifdef's for BSD and cleanup 2015-01-02 17:07:49 -05:00
Isaac Connor 1137c3907e ifdef's for BSD 2015-01-02 17:06:16 -05:00
Isaac Connor e460c6f448 BSD uses some different includes, these are from FreeBSD ports 2015-01-01 17:18:12 -05:00
Emmanuel Papin 8619ed1322 Only load plugins when it is necessary 2015-01-01 22:33:03 +01:00
Emmanuel Papin fe0476f36b Revert commit 123326c299 2014-12-21 21:20:36 +01:00
Emmanuel Papin d9bcf3aeef Fix bad declaration in zm_detector.h 2014-12-21 20:54:42 +01:00
Emmanuel Papin d961831355 Fix conflict when merging upstream master 2014-12-13 19:54:54 +01:00
Andrew Bauer 62b75808b3 Output to stderror when zmu can't read zm.conf 2014-12-10 17:54:09 -06:00
Isaac Connor 48f4d7eb93 Merge branch 'master' into BSD_device 2014-12-08 16:53:39 -05:00
Andrew Bauer 97ee989a94 Parse multiple streams in RTP-Info 2014-12-02 19:33:05 -06:00
Andrew Bauer a6a779978a move seq and rtpTime declarations outside conditional 2014-12-01 17:21:49 -06:00
Andrew Bauer 0099b54248 Make lack of RTP-Info non-fatal 2014-12-01 17:15:08 -06:00
Andrew Bauer 4a248cc3aa add rtsp mediatype of application 2014-12-01 17:05:10 -06:00
Andrew Bauer 32e818e860 Check for RTSP timeout in PLAY command response 2014-12-01 16:58:42 -06:00
Emmanuel Papin 9e39924095 Fix confict when pulling master 2014-11-29 19:11:22 +01:00
Isaac Connor 02cdc37e3c Merge pull request #607 from manupap1/memory_fix_leaks 
Fix some memory leaks in zma
 2014-11-29 10:18:17 -05:00
Isaac Connor 51aa4e67ea Merge pull request #608 from knnniggett/RTSP_mUrl 
echo the URL to the RTSP device during the OPTIONS directive
 2014-11-29 10:14:26 -05:00
Andrew Bauer e4fa475d87 Merge pull request #588 from ZoneMinder/digest_auth 
Digest auth
 2014-11-29 08:32:08 -06:00
Andrew Bauer 1cff253dde echo the URL to the RTSP device during the OPTIONS directive 2014-11-29 08:13:06 -06:00
Emmanuel Papin 346015f472 Fix some indentations in zm_monitor.h 2014-11-29 14:39:57 +01:00
Emmanuel Papin c313e2e389 Fix a memory leak in Monitor::Analyse() 2014-11-29 06:06:10 +01:00
Emmanuel Papin 73b25a1de0 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_mismatches 2014-11-29 03:39:05 +01:00
Emmanuel Papin 41edb4d958 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_leaks 2014-11-29 03:38:45 +01:00
Emmanuel Papin a4c01435d7 Fix confict when pulling master 2014-11-29 03:37:06 +01:00
Isaac Connor e6d47781d3 add Digest Authentication handling for simple http method. 2014-11-28 15:56:58 -05:00
Isaac Connor 87c741b165 Merge pull request #574 from manupap1/rtsp_fix 
Fix memory leaks with rtsp and a bug
 2014-11-26 15:13:39 -05:00
Isaac Connor 51703f5c37 Merge pull request #575 from manupap1/memory_fix 
Close logger and database on exit
 2014-11-26 15:08:21 -05:00
Isaac Connor 00287ab5dd more debug output when buffer is undersized. 2014-11-25 14:51:20 -05:00
Emmanuel Papin dde1e13f22 Merge branch 'master' into plugin_support 2014-11-21 14:02:12 +01:00
Isaac Connor 9eda71570a merge the rest of my Digest-AUth fixes: This should solve #399 2014-11-20 10:44:31 -05:00
Isaac Connor 0b5a0df7dc implement http_Digest Auth, and improve it for rtsp 
Conflicts:
	src/zm_remote_camera_http.cpp
	src/zm_rtsp.cpp
 2014-11-20 10:33:58 -05:00
Emmanuel Papin 81f4c2aa10 Revert memory leak patch in Monitor class (break analysis) 2014-11-20 00:33:22 +01:00