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

285 Commits

Author SHA1 Message Date
m-bene 82447ebb27 remove unwanted comment change 2014-05-17 22:05:57 +02:00
m-bene f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene de107f77ba fix option help text for overlooked languages 2014-05-17 04:51:01 +02:00
m-bene 9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
m-bene ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
Kfir Itzhak 1f29aa432a Minor corrections to the cURL source type in the web interface 2014-04-23 12:12:41 +03:00
Kfir Itzhak 3cee6a133d Merge remote-tracking branch 'Sune1337/motion/FrameSkip' 
Conflicts:
	db/zm_update-1.27.1.sql
	web/lang/nl_nl.php
 2014-04-22 20:13:11 +03:00
m-bene f737af15b9 Fix reload loop on switching skins 2014-04-11 09:40:23 +02:00
Sune1337 6c637947e2 Ability to skip frames in motion detection. 
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
 2014-04-10 14:59:34 +02:00
Andrew Bauer 35468af815 Merge pull request #338 from m-bene/extendPreclusive 
add feature to extend preclusive zone alarm state by x frames
 2014-04-08 08:04:37 -05:00
m-bene 9a714f8d6d Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments 2014-04-07 16:11:48 +02:00
Isaac Connor d6a27b31e8 fix extra } 2014-03-24 13:44:06 -04:00
Isaac Connor bfb52ab9aa fix groups 2014-03-21 23:10:13 -04:00
Isaac Connor 967dda737c more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
Isaac Connor ffa952419c Merge branch 'mysql2PDO' 
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
 2014-03-20 16:48:03 -04:00
m-bene 2784b3d1f5 Merge master 2014-03-20 10:26:12 +01:00
m-bene 2345889d64 include ExtendAlarmFrames in Presets and enable input for preclusive zones only 2014-03-20 09:53:47 +01:00
m-bene 26777487dc add feature to extend preclusive zone alarm state by x frames 2014-03-09 17:05:39 +01:00
Andrew Bauer c2b93c3caf Merge remote branch 'nagyrobi/patch-26' into nagyrobi 2014-02-26 09:32:58 -06:00
Andrew Bauer fb698a6755 Merge remote branch 'nagyrobi/patch-23' into nagyrobi 2014-02-26 09:17:14 -06:00
Andrew Bauer 5b1c79e3d0 Merge remote branch 'nagyrobi/patch-22' into nagyrobi 2014-02-26 09:16:51 -06:00
Andrew Bauer 1dd8dc4aa6 Merge remote branch 'nagyrobi/patch-21' into nagyrobi 2014-02-26 09:15:47 -06:00
Andrew Bauer 805981e06a Merge remote branch 'nagyrobi/patch-4' into nagyrobi 
Conflicts:
	web/skins/classic/js/skin.js
 2014-02-26 09:04:19 -06:00
Andrew Bauer 18d56e20aa Merge remote branch 'nagyrobi/patch-13' into nagyrobi 2014-02-26 08:46:21 -06:00
Andrew Bauer dee44c8f8d Merge remote branch 'nagyrobi/patch-12' into nagyrobi 2014-02-26 08:45:57 -06:00
Andrew Bauer c899de65a4 Merge remote branch 'nagyrobi/patch-5' into nagyrobi 2014-02-26 07:55:36 -06:00
Andrew Bauer 26be1bd041 Fix builtin authentication issue caused by commit 6e5d927 2014-02-14 18:56:27 -06:00
Andrew Bauer d20e0ee2e7 Temporary workaround to show all ptz control types regardless of monitor source type. 2014-02-13 08:43:19 -06:00
Kfir Itzhak b2a65dc343 cURL minor corrections and improvements 2014-01-10 09:17:12 +02:00
Kfir Itzhak 9901ce9e84 Merge remote branch 'origin/master' into curl 2014-01-05 10:16:01 +02:00
Kfir Itzhak a962815624 Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one 2014-01-05 08:59:09 +02:00
Isaac Connor b3af313370 Merge pull request #282 from scottgrobinson/master 
Add zmMontageScale so montage scale is also 'saved'
 2014-01-02 11:18:39 -08:00
Adam J. Henry e6b9b8218b Enclose value of the Notes attribute with quotes. 2013-12-31 17:32:20 -06:00
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02:00
Kfir Itzhak bf708a8373 Merge branch 'master' into curl 
Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/zm_camera.h
	src/zm_monitor.cpp
	web/skins/classic/views/console.php
	web/skins/classic/views/monitor.php
 2013-12-27 14:21:12 +02:00
Scott Robinson 375d67cdf2 Update montage.php 
Make use of new zmMontageScale cookie
 2013-12-22 20:56:18 +00:00
Scott Robinson db41693fd6 Update montage.js 
save montage scale % as cookie
 2013-12-22 20:53:09 +00:00
Edward Barnard 14024451e5 Monitor link now displays for all valid libvlc paths. 2013-12-22 01:29:40 +00:00
Edward Barnard 3201e5a431 Adds web ui support for libvlc camera. 2013-12-19 21:51:39 +00:00
Kyle Johnson cad33ddb96 Removed embedded jquery, instead include by <script>. Fixes #274 2013-12-17 13:41:55 -05:00
Kyle Johnson 1a744ebed6 Added jquery 1.4.2.min.js to the classic skin's js dir 2013-12-17 13:41:36 -05:00
Isaac Connor 3393a63525 more updates 2013-12-17 12:53:15 -05: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
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
Philipp Rehs 55dadcf758 Network Detection Support for Wansview 
Basis support for Wansview Cams
Tested with NC541W
 2013-11-30 20:46:59 +01:00
Isaac Connor 1519db78ce add ServerHost filter 2013-11-13 10:13:09 -05:00
Isaac Connor a155082997 use parameter passing instead of esacping 2013-11-12 15:39:29 -05: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 463d8a136f Merge branch 'master' into mysql2PDO 
Conflicts:
	zm.conf.in
 2013-11-08 11:22:09 -05:00