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

48 Commits

Author SHA1 Message Date
Isaac Connor a3f4837186 Use config options for tile datam access tokens and turning geolocation on/off 2020-09-24 20:30:57 -04:00
Isaac Connor 74dc8af76f add global 2020-09-07 13:29:21 -04:00
Isaac Connor 7e6fbe1ab4 Fix ControlTypes dropdown. 2020-09-05 08:46:18 -04:00
Andrew Bauer 990b5bd9dc monitor view - convert links to buttons 2020-08-28 15:22:57 -05:00
Isaac Connor c0f21ab55d Fix globals 2020-08-04 16:36:24 -04:00
Isaac Connor 264ba6525b Remove debug 2020-04-21 12:19:18 -04:00
Isaac Connor 1b653e7e79 Add warnings for when SaveJPEGs and VideoWriter are both set to disabled 2019-09-25 10:14:41 -04:00
Isaac Connor b9b52c964e Upgrade monitor saving and viewing 2019-09-19 14:56:16 -04:00
Isaac Connor ee3a0c1fd1 fix validateForm running on monitor cancel due to lack of type=button on cancel button 2019-02-08 09:55:32 -05:00
Andrew Bauer 86b2f6a12e New Monitor Type - Website (#2065) 
* implement website monitor

* don't check certain fields when using website monitor

* continue to fix javascript errors for website monitors

* check $monitor, not $new_monitor here

* add website monitor documentation

was somehow left out of the initial commit

* fix corruption of functions.php

* add missing comma

* remove errors by testing for existence of key.  If it's a new monitor, then none of the keys will be valid

* If the monitor type is WebSite, then default Status to Running.

* put back start function that got lost in merge.  Don't start StreamCmd's if it's a WebSite

* Add midding comma

* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite

* Don't show control or any of the status fields for WebSite type monitors

* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
 2018-04-26 17:18:36 -04:00
Isaac Connor ea4937b75e put back missing s 2018-01-23 17:47:24 -05:00
Isaac Connor 0742217599 Only populate monitorNames if query is valid 2018-01-23 13:28:29 -08:00
Isaac Connor 8a27ea3a04 Always populate the monitorNames object, and check for duplicate names when saving an existing Monitor as well as new monitors 2018-01-22 11:42:52 -05:00
Isaac Connor 7374ced076 0 is a prefectly valid PreEventCount 2017-11-05 10:00:24 -05:00
Isaac Connor b6dde354be rename AnalysisFPS to AnalysisFPSLimit 2017-10-24 17:34:32 -07:00
Isaac Connor c7626cab94 fix dash 2017-10-10 12:15:41 -07:00
Isaac Connor 7f50a13074 add Event disk space recalc to zmaudit 2017-10-10 12:11:59 -07:00
Isaac Connor 06c61f0324 allow periods in monitor name 2017-10-10 10:40:27 -07:00
Isaac Connor 4763ace165 Merge branch 'master' into storageareas 2017-05-18 14:24:09 -04:00
Isaac Connor d1c61a252f fix whitspace/braces 2017-05-18 13:50:56 -04:00
Isaac Connor b6c02b563b turn off host validation 2016-07-14 10:22:09 -04:00
Robin Daermann 71db9b84e6 Allow spaces in monitor names 2016-03-24 14:37:24 +01:00
Emmanuel Papin 649a39b372 Replace analysis interval parameter by analysis framerate 2015-07-23 16:36:30 -04:00
Emmanuel Papin 132e0a1798 Add analysis fps paramter to monitors 2015-07-22 21:38:35 +02:00
Emmanuel Papin a6b7c6e99f Add analysis interval parameter to monitors 2015-07-21 22:52:52 +02:00
Andrew Bauer 3a94712db2 add translate function 2015-05-10 08:10:30 -05:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11: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 d20e0ee2e7 Temporary workaround to show all ptz control types regardless of monitor source type. 2014-02-13 08:43:19 -06:00
Isaac Connor 9d89fb3bcb Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -04:00
Isaac Connor 0a3ffb5e2e fix control types dropdown for a new monitor 2013-05-09 14:11:20 -04:00
Kyle Johnson 2c04d0774f Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
Kyle Johnson 1ed6462354 Removed all of the old web files 2013-05-01 06:52:43 -04:00
Kfir Itzhak bdf0687550 1) Added support for JPEG and MJPEG capture palettes - needs to be tested 
2) Allow the blend percent to be zero, to disable blending
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 8ac3dda54b 1) Removal of the ZM_LOCAL_BGR_INVERT option. 
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak c3ecdd00e0 1) Relocated conversion functions and tables to zm_image.cpp 
2) SSE2 aligned memcpy now functional
3) Fixed fill functions bug from an earlier commit
4) Many changes to zm_local_camera.cpp format selection
5) Fixed memory leak in AssignDirect()
6) Fixed Target Colorspace webinterface issues
7) Small other changes
 2012-02-01 07:33:20 +02:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 0ff4e53832 Allow FPS reporting to be disabled by setting valure to zero 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3308 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-03-02 12:23:10 +00:00
stan 3c10237833 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-05-28 08:47:59 +00:00
stan f5d7391e72 Changed Object reference to Hash for mootools 1.2 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2828 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 13:00:20 +00:00
stan 54dc3b9668 Improved monitor naming checks and validation. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2826 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 10:55:19 +00:00
stan fc2a20bd5f Further mootools migration 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2822 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-30 08:56:31 +00:00
stan ba788cc001 Fixed issues with creation, editing and deletion of monitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2626 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 16:43:34 +00:00
stan 31a0762d9e Fixed issues with remote method not being preserved. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2622 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 14:59:02 +00:00
stan 0c2edfef4a Corrected selection of LinkedMonitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2619 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 14:03:52 +00:00
stan 8326e0d62e Fixed js issues with IE 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2571 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 16:20:25 +00:00
stan bfd67f69fd Fixed to work properly with MPEG cameras and presets 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2537 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 08:40:21 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00