Commit Graph

459 Commits

Author SHA1 Message Date
nagyrobi bd4aae4c1e Update console.php
Fix the bandwidth status sentence on the top of the console window, the last word is different than the universal 'bandwidth' word in many other languages.
2013-08-16 14:08:38 +02:00
nagyrobi a186981278 Update monitor.php
Enable localization of the monitor function names in the monitor settings window.
2013-08-16 13:48:25 +02:00
nagyrobi 0c098e2b0f Update function.php
Enable localization of the monitor function names in the function window.
2013-08-16 13:41:33 +02:00
nagyrobi ff9cbeff6b Update console.php
Enable localization of the monitor function names in the console.
2013-08-16 13:39:42 +02:00
nagyrobi bc18a27072 Update skin.js
Increased popup window sizes just a little bit, to prevent the longer foreign language translated strings to break window layouts.

Fine-tuned again, I hope that's the final one :-)
2013-08-16 10:13:35 +02:00
nagyrobi 9c7653ca68 Update timeline.php
Enable localization of the usage instructions in the Timeline window.
2013-08-15 18:58:08 +02:00
nagyrobi 8ce4d302dd Update montage.php
Enable localization of the dropdown box items in the montage window.
2013-08-15 18:56:01 +02:00
nagyrobi 2b0647a52c Update skin.css
Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts.
2013-08-15 12:48:04 +02:00
Kyle Johnson ee251b3c02 Removing lingering references to UsedPl 2013-08-13 12:34:59 -04:00
Isaac Connor 266b67d0bd Support for control when monitor source is ffmpeg. This should fix #16. 2013-08-13 08:34:37 -04:00
Isaac Connor 3a305522c4 Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop 2013-07-25 11:50:24 -04:00
Isaac Connor cdac403fb1 Merge ../zum into develop
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
Kyle Johnson bb19e80fa8 Support for control when monitor source is ffmpeg. This should fix #16.
Some IP cameras need the source set to ffmpeg even though they are remote
cameras.  These cameras do have a remote PTZ interface, but previously
when the monitor source was set to ffmpeg, the only control type
available was 'none'.
2013-06-15 19:50:19 -04:00
Isaac Connor 3a8481a591 cleanup 2013-05-10 14:02:22 -04:00
Isaac Connor a468baf9eb cleanup 2013-05-10 13:55:45 -04: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
Isaac Connor 7cf5475542 Merge ../ZoneMinder-kfir into kfir-proper
Conflicts:
	configure
	src/Makefile.am
	src/Makefile.in
2013-05-02 21:28:51 -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
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak 0fe55a18bf Something useable :)
1) Added optimized versions of four field deinterlacing, including SSSE3 ones.
2) Removed the "Very Soft" and "Very Hard" options.
3) Deinterlacing happens before any rotation to the image.
2012-07-15 17:30:37 +03:00
Kfir Itzhak a6c7acd02a Some more progress on the deinterlacing code. 2012-07-13 20:11:16 +03:00
Kfir Itzhak f27b424503 Much more progress!
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
2012-07-13 20:11:16 +03:00
Kfir Itzhak 8f0ec42ba2 First work on adding built-in deinterlacing to ZM. 2012-07-13 20:11:16 +03:00
stan 4996dd0a51 Recreated generated files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:46:18 +00:00
stan be97b244b4 Increased size of options window and changed to use debug functions instead of console ones.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3659 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 08:58:19 +00:00
Kfir Itzhak 2dfdc8129c Few small fixes:
1) Added a workaround against SWS_CPU_CAPS_SSE2 not being defined.
2) Fixed enableDisableAlarms javascript error.
3) swscale unsupported format errors now include the unsupported format in the error.
4) Fixed a small error affecting local cameras with rotation enabled.
2012-03-07 14:33:09 +02:00
Kfir Itzhak d5fbd351b3 Small corrections 2012-02-01 07:33:21 +02:00
Kfir Itzhak be8ef02a7c Small corrections 2012-02-01 07:33:21 +02:00
Kfir Itzhak b4921c4403 1) Made 24bit the default target colorspace.
2) Changed crop info's layout.
2012-02-01 07:33:21 +02:00
Kfir Itzhak 066fe89718 Added automatic capture palette selection. 2012-02-01 07:33:21 +02: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 eeaed7ccd3 Some small changes
1) Fixed wrong size calculation in Image::AssignDirect.
2) Improved libjpeg subpixel order selection.
3) Finished adding support in the simple Overlay function.
4) Completed Flip and Rotate 32bit RGB support.
5) Allow ZM to compile on 32bit with omit frame pointer disabled by defining _DEBUG
   To use one less register in the SSE algorithms.
6) Removed the counter variable in some loops to reduce loop overhead.
7) Modified crop query error handling.
8) Most of the shared data now declared as volatile.
9) Small improvements to the AlarmedPixels motion detection.
10) Changed the default blend percent from 7% to 12%.
11) Fixed an earlier bug created by me: motion detection checking the wrong pixels.
2012-02-01 07:33:20 +02:00
Kfir Itzhak 642a1bfdb2 1) RTSP support for direct capture and target colorspace.
2) Hopefully fixed the mmap unexpected shared memory size completely this time.
3) Added 32bit RGB and grayscale support to the signal checking.
4) Fixed zms\nph-zms keeps running after changing capture options, eating CPU and has to be killed with -9.
5) Default monitor options changed again.
6) Fixed unrelated bug: Undefined constant ZM_V4L2 in monitor probe.
7) Fixed unrelated bug: Error in offset X in monitor probe.
8) Changed monitor probe's prefered capture settings.
9) Small other minor changes.
2012-02-01 07:33:20 +02:00
Kfir Itzhak b0bc227232 1) Made shared memory 16 byte aligned and identical size and layout for all platforms.
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
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 2c47a15f9b Use event dimensions instead of monitor ones as they may have changed.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3520 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:53:29 +00:00
stan b64c506659 Added SFTP upload option.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
stan 3a399378b2 Fixed problem with link to overlay css file
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3485 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-27 16:09:09 +00:00
stan bf90ab8158 Added error trapping to log file exports.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3463 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 22:33:07 +00:00
stan 1ce54fb0db Enabled alternate selections when a filter has been chosen. Improved
styles for debug entries in log.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3462 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 21:53:45 +00: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
jaidhar 96249db582 eyeZm Plugin: Patched functions.php to check for ffmpeg codec support via -formats as well as -codecs
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3399 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-08 22:37:19 +00:00
stan b3d8279dfc Fixed problem with transparency
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3373 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-27 10:41:43 +00:00
stan a6011b4f93 Fixed down/right PTZ image
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3372 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-27 08:39:22 +00:00
stan d2f5e9623c Added checks for mismatches between system and database versions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3364 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 09:15:14 +00:00
stan 7b43ac2645 Use JSON encoding for language independent serialisation (filters and control commands) rather than PHP serialisation. Removes dependency on rare PHP::Serialization perl module.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3357 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 16:18:18 +00:00
jaidhar d0f8e7e1aa eyeZm Plugin: Changed text on H264 splash page
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3317 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:10:17 +00:00
jaidhar 7c430cd7a5 eyeZm Plugin: Changed loading text for H264 splash screen
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3316 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:10:03 +00:00
jaidhar 6645cd0a8f eyeZm Plugin: Removed -s tag from ffmpeg to allow it to automatically pick size, and added viewport meta-tag to h264 splash page
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3315 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:09:50 +00:00
jaidhar f2caca6f2f added single-shot when fps=0 for vcodec=mjpeg
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3314 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:09:34 +00:00
jaidhar 923fd832e5 Incremented to p2fs3, added rescaling support for 'vframe' action, added viewport tag to vfeed for mjpeg mode
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3313 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:09:20 +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 f0a012ebfd Fixed bug to do with V4L versions and monitor settings
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3307 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:04:52 +00:00
jaidhar e3f8bdb6cd XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-19 20:25:54 +00:00
jaidhar 15de28e665 XML Plugin: Securing code by escaping SQL strings, and validating input parameters
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3305 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-19 20:25:22 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 21:59:06 +00:00
stan efa583aed0 Fixed JSON request queueing issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3299 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:17:44 +00:00
stan 49daed8658 Changed name of event variable as Chrome objects.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3289 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-08 14:30:59 +00:00
stan f92752b358 Added more content headers for video download.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3288 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:52:10 +00:00
stan 240027dd98 Fixed javascript error due to archive button permissions - http://www.zoneminder.com/forums/viewtopic.php?t=15387
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3286 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:17:42 +00:00
stan 45f1ee9c36 Fixed restricted user not being able to select a monitor in console - http://www.zoneminder.com/forums/viewtopic.php?t=15347
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3285 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:14:16 +00:00
stan 48d287f9de Fixed bug where unarchiving multiple events would not work - http://www.zoneminder.com/forums/viewtopic.php?t=15272
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3282 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:06:44 +00:00
stan 98203e6c2f Improved stream handling for single image mode, for Chrome etc.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3281 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:04:11 +00:00
stan 1027b1c75b Prevented memory exhaustion in timeline view for very long events
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3277 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:28:49 +00:00
stan 5203205680 Improved formatting of options and help.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3229 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-20 18:38:24 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
stan dc9e2755b0 Added sample apache config file.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:27:58 +00:00
jaidhar 1a8d7c46fc XML Plugin: Bugfix where EVENT_IMAGE_DIGITS other than 3 would not work. Now uses define
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3215 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-30 12:35:14 +00:00
jaidhar 4dc1fac544 XML Plugin: Added commenting for config.php defines
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3211 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-30 04:32:43 +00:00
stagecoach 79e24aef44 updated /web/skins/classic/views/options.php:
added tab for skin selection
updated /web/lang/en_gb.php:
added Display entry and SkinDescription entry

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3206 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-24 01:35:12 +00:00
jaidhar 635d8e1dad Grab FFMPEG from ZM_PATH_FFMPEG (if available), more robust error checking against codecs and paths
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3203 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:51 +00:00
jaidhar bd31f9ec4b IP Address printout in XML Loggin
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3202 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:33 +00:00
jaidhar 069136fe53 Added vlog function to view log output, ability to redirect XML logging to it's own file
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:18 +00:00
jaidhar 18bcfcff7f Added support for deep-event storage
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3200 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:48 +00:00
jaidhar c7b3d04eed Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:33 +00:00
jaidhar d3fa2b2df3 Changed default H264 bitrate for events to 128kbit
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3198 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:07 +00:00
jaidhar f0165bab78 Prettied-up the splash screen for H264, modified FFMPEG encoding parameters for H264 slightly
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3197 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:07:52 +00:00
jaidhar 5ed6fccd20 - Incremented to p2fs2
- H264, MPEG-4 and MJPEG support for encoding of events through parameters now
- Display overlay of still-capture when streaming H264 (transparency)
- Introduced logXmlErr macro

Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3196 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:07:37 +00:00
jaidhar 7ab4d4efbe XML Plugin: Modified H264 behavior to utilize internal MPMoviePlayercontroller in eyeZm. Works more reliably now.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3195 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-15 21:35:29 +00:00
jaidhar 56018fc9b3 XML Plugin: Another bugfix in getEventPathSafe() to account for more variations in ZM installations
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3194 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-15 02:48:12 +00:00
jaidhar f85c060ba6 XML Plugin: Check for ZM_DIR_EVENTS being defined in getEventPathSafe()
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3193 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-14 18:33:55 +00:00
jaidhar e57c1b0331 XML Plugin: More config options added, stability fixes to H264 streaming
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 23:04:09 +00:00
jaidhar 78caa0adb0 XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 04:26:31 +00:00
jaidhar 461374dc2a XML Plugin: Minor commit to impove h264 web-page appearance
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3187 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 07:57:46 +00:00
jaidhar 2d7979ac93 XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 05:25:43 +00:00
jaidhar 97a99993d7 XML Plugin: Added preliminary H264 feed stream support
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3185 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-10 22:20:29 +00:00
jaidhar f4b75d4f14 XML Plugin: Speed improvement where using inner join on Frames table was causing large delays for huge tables
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3184 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-10 01:32:14 +00:00
jaidhar 6307ecbb0c XML Plugin: Checked for define of ZM_WEB_x_CAN_STREAM since 1.24.1 and .2 don't have this
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3182 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-08 17:23:13 +00:00
jaidhar 2a09efdfd4 XML Plugin: Looks like getEventPath is broken between 1.24.2 and 1.24.3, implement getEventPathSafe to workaround
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3181 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-07 04:05:16 +00:00
jaidhar 039358e00c XML Plugin: Removing README
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3180 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-07 02:00:50 +00:00
jaidhar 2fc3936ec5 XML Plugin: vframe action checks if file exists and outputs image if not
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3179 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-07 01:23:08 +00:00
jaidhar dd337affdc XML Plugin: vframe action can now display alarm, regular and analyze frames based on input parameters, console can be sped-up by using 'nostatus' tag to skip daemon-check
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3178 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-06 01:37:32 +00:00
jaidhar 41405e1115 XML Plugin: Added vframe action, some more defines, condensed vevent parameter requirements
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3177 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-05 23:41:09 +00:00
jaidhar 1c7086dc39 XML Plugin: Modified event query to return frame scoring information along with the frame ID of the max. scoring frame
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3176 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-05 17:50:39 +00:00
jaidhar d6575d90e1 XML Plugin: Split off actions from console.php into it's own file, actions.php
- Fixed bug where authentication wasn't being handled properly



git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3175 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-05 16:48:57 +00:00
jaidhar b60e60b062 XML Plugin: testing with eyeZm v1.1 and 1.24.3, bugfixes accordingly
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3174 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-04 19:25:34 +00:00
jaidhar e86444cbc3 Importing initial XML Plugin files to build structure. Updated autoconf files to include Makefiles
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3173 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-04 07:07:40 +00:00
stan 51a03d84ee Updated with new bandwidth based stream config. Changed streaming to be more flexible.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3171 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:42:10 +00:00
stan 32578e3fbf Updated with new bandwidth based stream config. Fixed inadvertent triple equals comparison.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3170 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:41:00 +00:00
stan eda9757415 Updated with new bandwidth based stream config. Fixed inadvertent triple equals comparison.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3169 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:40:33 +00:00
stan 9559ea297b Updated with new bandwidth based stream config
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3168 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:39:47 +00:00
stan 7e1979760e Updated with new bandwidth based stream config
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3166 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:36:03 +00:00
stan 70aee2ad56 Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3160 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:50:41 +00:00
stan 88a6371d46 Preserve replay mode in cookie
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3159 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:49:46 +00:00
stan 9052dc1313 Corrected syntax error.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3158 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:46:57 +00:00
stagecoach 1d77e03622 Updated skins/classic/includes/export_functions.php:
- time and date stamp in file name of master .html file modified: removed chars (i.e. :) that could trip up some browsers

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3150 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-20 18:13:29 +00:00
stagecoach b5146a067c Updated skins/classic/includes/export_functions.php:
- human-readable time and date stamp in file name of master .html file
- after download to client, master .html file is being removed from server

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3149 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-19 21:14:08 +00:00
stagecoach b7d8f58929 Changed from
div.makeDraggable( { 'container': $('imageFrame'), 'onStart': setActivePoint.pass( i
), 'onSuccess': fixActivePoint.pass( i ), 'onDrag': updateActivePoint.pass( i ) } );

to

div.makeDraggable( { 'container': $('imageFrame'), 'onStart': setActivePoint.pass( i
), 'onComplete': fixActivePoint.pass( i ), 'onDrag': updateActivePoint.pass( i ) } );

So that motion detection areas are properly re-computed and updated in Zone config pages and db.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3144 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-12 22:50:49 +00:00
stagecoach ee50a8c42e Playback functionality embedded into exported jpeg event.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3131 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-09-29 16:19:41 +00:00
stagecoach 2709b3eec6 Stagecoach Wireless Second Test Commit:
commented string removed from file below to reverse first test commit

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3130 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-09-29 00:57:52 +00:00
stagecoach 80c5c3edb1 Stagecoach Wireless Test Commit:
commented string, will be removed with second test

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3129 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-09-29 00:55:10 +00:00
stan 60f0136ed3 Merged in image root changes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 19:16:40 +00:00
stan 2b375ef264 Changes to querying and probing.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3037 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 17:38:30 +00:00
stan 9b31bf29e8 Added in image view to allow event root to be able web root
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:12:12 +00:00
stan 1432bbed60 Changed splitcalls to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3030 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:10:36 +00:00
stan 4f0c4cced0 Changed use of deprecated split function to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3025 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:11:58 +00:00
stan 63988218a7 Changed use of deprecated split function to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3024 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:11:37 +00:00
stan 6f464e7152 Changed use of deprecated split function to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3023 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:11:17 +00:00
stan 6659797e7d Changed use of deprecated split function to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3022 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:10:38 +00:00
stan bac71436fd Changed use of deprecated split function to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3021 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:10:10 +00:00
stan 84e6d5142a Seyi export bug fix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3020 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:09:29 +00:00
stan 266e669dde Modified console filters to include archived events and fixed filters for timeline zooming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2989 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-20 21:36:17 +00:00
stan f57480a6fe Correctly location of favicon for mobile skin
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2988 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-18 20:15:49 +00:00
stan 3ce4caa8e4 Corrected incorrect use of request variable
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2987 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-18 17:55:52 +00:00
stan 97ba7a6684 Corrected some Mootools issues, autoCancel => link: cancel and onComplete => onSuccess. Also fixed montage alarm state class handling
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2986 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:13:16 +00:00
stan 128fb0b07b Fixed montage css behaviours
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2984 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:10:41 +00:00
stan 2b519225dd Fixed CSS typos
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2983 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:10:07 +00:00
stan 1fad2d7ec9 Changed query separator to &amp; and miscellaneous html fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:09:16 +00:00
stan 6fc7acb378 Changed query separator to &amp; and added CDATA wrapper.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2981 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:04:44 +00:00
stan e0801bc216 Updated to use mootools 1.2.3
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2978 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 17:38:13 +00:00
stan 64b5290d14 Fixed broken link on time display
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2972 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 09:40:49 +00:00
stan b7405349c1 Removed bogus non-filter parameter
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2967 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-08 20:20:06 +00:00
stan 93b955813f Further PTZ preset tweaks
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2958 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 14:16:17 +00:00
stan 1e2ecf0947 Updated Makefiles
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2957 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 13:35:23 +00:00
stan c5a0f98309 Factored out action and request control functionality. Added presets to mobile view for PTZ cams.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2956 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 13:34:10 +00:00
stan 8cad0dbd6a Updated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-24 10:27:28 +00:00
stan d529a079df Fixed typo.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2930 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-22 11:23:28 +00:00
stan 11a1cc2d41 Now supports custom perl install path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +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 034f37cf4b Applied contributed patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-25 18:03:46 +00:00
stan e5005b03b2 Fixed missing tag close.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2871 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-13 10:48:58 +00:00
stan e69489e841 Changes to stills event view for IE etc
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2866 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 11:21:28 +00:00
stan eaaaf88493 Applied 'mitch' IE compatibility patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2865 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 10:04:12 +00:00
stan 282a542a6a Ignore unparseable arp output.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2862 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-06 09:49:30 +00:00
stan d3787426f9 Fixed problem with 1 pixel gap in continuous events strip.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2861 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-06 09:49:09 +00:00
stan ce8e120765 Fixed undefined filterData when saving filters.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2847 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 10:13:06 +00:00
stan 72f908c4e7 Changed streaming to dynamically reduce frame rates if streams are sent too slowly. Made low bandwidth montage more resilient.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2844 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:10:54 +00:00
stan 09bf78f865 Removed the stream scaling command as kills FireFox now.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2843 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:08:57 +00:00
stan 1edb48f358 Updated makefiles.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2838 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 09:06:12 +00:00
stan db81975d29 Fixes the standalone control view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2837 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 08:37:10 +00:00
stan dc42b4a83b Further mootools mods and slightly enlarged event view
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2836 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 08:01:49 +00:00
stan 93d1cf8ed2 Updated makefiles
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2835 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 14:10:04 +00:00
stan b044291233 More mootools 1.2 migration mods.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2833 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 14:06:13 +00:00
stan 62503acd16 Added monitor probe facility
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2829 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 13:00:49 +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 3310ea3ae9 Added V4L version to presets and generic PAL/NTSC standards
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2823 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 12:00:14 +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 7b4c0fa926 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2820 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-03-27 16:01:59 +00:00
stan cfccc4b9bf Updates to event export and javascript fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2814 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-27 09:14:54 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:59:13 +00:00
stan 3069dc2402 Final timestamp update
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:32:04 +00:00
stan 133c9acfa0 Fixes and tweaks for filter view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2800 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:28:45 +00:00
stan 57f8127498 Slight revamp
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2782 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:17:33 +00:00
stan 269306bc67 Fixed reordering down link issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2780 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 10:05:31 +00:00
stan 66a19fe99b Fixed control preset issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2779 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 09:45:29 +00:00
stan 2f9524d00e Fixed issue with default mobile view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2761 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:12:15 +00:00
stan e3dce264e0 Fixed issue with exporting. Typo plus over-escaping.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2759 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 22:44:37 +00:00
stan 8cc598d2f8 Fixed issue with default V4L version being v2 but default options displayed were for v1
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2758 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 22:44:11 +00:00
stan 847606a200 Fixed further with editng control capabilities
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2737 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-30 17:43:29 +00:00
stan 19ddc42f4b Fixed bogus reference to $control
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2735 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 17:44:32 +00:00
stan c2cf6e31bc Fixed issue with control edit screen losing changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2734 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 17:25:05 +00:00
stan cdc31b0e6d Reduced initial events list load time.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2732 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 14:14:41 +00:00
stan 56b5099c4c Added window size for frame view
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2731 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 14:14:25 +00:00
stan e0310c0760 Commented out some V4L2 palette options.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2730 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 12:50:58 +00:00
stan e14efbd493 Updated generated files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:24:01 +00:00
stan 21d8d74a28 V4L2 updates
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2723 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-27 11:07:24 +00:00
stan b3b226ebe1 Changed labels to work better with ffmpeg monitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2720 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-21 17:45:30 +00:00
stan 23d82a7e03 Added FFMPEG camera type
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:01:32 +00:00
stan d43d2289ed Changes from updated build tools.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 14:54:50 +00:00
stan 4cf484e8ad Changed > to &gt;
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2711 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:54:15 +00:00
stan 549aa39cbb Updated autoconf/make files
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:05:56 +00:00
viseon 2419b6582e Handle errors returned from Ajax more gracefully.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2709 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:58:58 +00:00
stan 105c51b975 Adde in missing rename of showControls.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2696 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 19:06:35 +00:00
stan 276533129d Made DVR control appearance conditional on replay buffer being set
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2694 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:46:32 +00:00
stan 50f60ab9d8 Added in conditional regexp http support
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2693 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:45:01 +00:00
stan 7d96edeacd Added .in files to svn
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2681 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 12:14:50 +00:00
stan e60149ce36 Modification to streaming to avoid making stream buffer if not required. Also cycle fix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2679 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-29 23:08:21 +00:00
stan b7f97d388f Added configuraion and detection of V4L2 to web interface.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2678 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 14:25:12 +00:00
stan 012ac787f6 Fixed filter execution issues.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2669 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-20 08:25:24 +00:00
stan ce58beb903 Fixed issues with filters
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2662 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-14 12:13:55 +00:00
stan 3663ea922b Better handling of view only priveleges
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2658 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-09 09:15:53 +00:00
stan 0a9298dbbe Various web bugs fixed
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2651 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-07 09:02:17 +00:00
stan 31d349124d Fixed with montage when groups empty
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2649 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 20:07:22 +00:00
stan d2856ed019 Fixed issues with control capabilities and moveMap on watch view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2648 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:58:13 +00:00
stan 3714e5175c Remove redundant initialisation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2647 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:17:28 +00:00
stan 7f7ba4d605 Fixed issue with incorrect monitor count in console
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2646 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:16:45 +00:00
stan 1080485c33 Motage and event list issues, fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2642 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 15:29:14 +00:00
stan 8af774a98c Fixes and patches.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2641 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 08:41:23 +00:00
stan 323338b661 Applied Corey patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2640 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 13:15:13 +00:00
stan 5bfe4b72c7 Fixed typo.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2637 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 11:42:59 +00:00
stan bec3dc9ff6 Fixed options issues including missing restart arning.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2636 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 08:55:25 +00:00
stan d4b0eaa554 Timeline revisions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2635 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 08:16:34 +00:00
stan ef8f7b85fd Continuing development and bugfixes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-26 09:47:20 +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 45190dee61 Fixed options and user editing issues.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2621 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:05:06 +00:00
stan 59ba3d4782 Whitespace
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2620 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:04:35 +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 2133e94945 Omit Options link if permission insufficient.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2617 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 13:58:27 +00:00
stan b8d9bd68c2 Fixed null view file
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2616 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 12:39:24 +00:00
stan 106882c161 Updated copyright notices
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:48:16 +00:00
stan 5789f6a38e Fixed to work with overriden skins
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2591 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-22 16:24:36 +00:00
stan b1c61a9eac Made all but base point size proportional
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2590 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-22 16:23:49 +00:00
stan 3fc9360255 Fxed MaxFPSs defaulting to 0.00 when not set.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2589 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 21:28:50 +00:00
stan 62a8d6f9bc Enlarged filter window.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2588 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:58:13 +00:00
stan 6880f9e2bb Removed unrequired Colours field
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2585 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:24:46 +00:00
stan 77fd8dafbf Added in better colour/palette initialisation for new monitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2581 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:19:25 +00:00
stan 78f7038dc2 Fixed problem with options help and globals
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2576 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-18 15:01:38 +00:00
stan e10bd0c3e4 Fixed tabs
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2575 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-18 14:54:10 +00:00
stan 03c66f87ef Fixed up tabs
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2574 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-18 14:53:44 +00:00
stan 44c54837c3 Fixed checkbox clearing not working and xhtml errors in layout.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2573 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-17 16:59:25 +00:00
stan 7e40dc663c Fixed canStreamApplet function call cockup
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2572 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 16:47:56 +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 0a20de9c1f Set button states on editing a monitor
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2570 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 16:03:53 +00:00
stan 58c861cd67 Fixed function call error
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2569 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:56:48 +00:00
stan 4d71f97fb8 Formatting of th elements
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2568 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:52:22 +00:00
stan a65ab058db Added simpler status query for still images
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2566 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:47:33 +00:00
stan 8418c4148e Removed php code
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2564 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:18:40 +00:00
stan 19fe97a8ca Cosmetic change
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2563 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 14:03:18 +00:00
stan b78f172803 Removed further redundant classes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2562 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:42:50 +00:00
stan 1041bbc036 Eliminated bighead and smallhead classes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2561 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:32:37 +00:00
stan 40393e50aa Moved calendar path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2559 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:22:22 +00:00
stan 8107c93933 Changed OPT_MPEG to OPT_FFMPEG
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2558 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:21:26 +00:00
stan d83525cf76 New paths to mootools and favicon. Reset.css not just screen media.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2557 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:18:05 +00:00
stan 37562208b6 Removed some redundant css definitions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2556 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:17:26 +00:00
stan cd2f1ea795 Fixed for new path to skin graphics
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2555 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:16:57 +00:00
stan fad6b0ec11 PTZ control restructuring.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2554 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:16:19 +00:00
stan 336ce62c15 Reorganised PTZ controls and layout somewhat
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2553 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:15:28 +00:00
stan d840a3e4f2 Fixed up properties
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2551 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:13:17 +00:00
stan 8b3ceb506b Moved PTZ graphics
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2550 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:06:21 +00:00
stan e7c025712a Fixed path to export functions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2541 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:53 +00:00
stan 5e4a953dcd Adjusted layout
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2540 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:37 +00:00
stan 5c9e835c73 Corrected error in configureButtons function
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2539 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:21 +00:00
stan a04b2b4f85 Corrected comments and added skin path as global js variable
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2538 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:40:53 +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