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

1400 Commits

Author SHA1 Message Date
Isaac Connor 51455b5c85 more updates and removal of escaping and quoting 2013-11-04 12:43:34 -05:00
Kfir Itzhak f73585dbaa Few web interface corrections regarding cURL 2013-11-04 17:28:15 +02:00
Kfir Itzhak 8e96df7643 Initial work on adding cURL to zoneminder 2013-11-04 16:52:21 +02:00
Kfir Itzhak fd656c55cf Changed default blend percentages and the dropdown list for alarm reference image blend 2013-11-04 12:10:53 +02:00
Kfir Itzhak 9d5ac7ae8c Fix cmake installing wrong files in an out-of-source build 2013-11-04 09:56:40 +02:00
Isaac Connor 4565068093 Merge pull request #233 from fastolfe/zone-marker-overflow 
Fix marker-out-of-bounds crash when defining zone points
 2013-11-03 13:10:07 -08:00
Isaac Connor 7989e8e980 Merge branch 'master' into mysql2PDO 2013-11-03 16:07:37 -05:00
Isaac Connor 2d0f4dffd1 Fix a missing NULL second paramter to dbFetchAll 2013-11-03 16:06:31 -05:00
Isaac Connor 6c6da67427 Merge branch 'master' into mysql2PDO 2013-11-03 15:57:45 -05:00
Isaac Connor 3fa91a30a3 allow the value side of config lines potentially be empty. 2013-11-03 15:52:37 -05:00
Isaac Connor 59b841958d use parameter passing instead of explicit exscaping 2013-11-03 15:40:00 -05:00
Kfir Itzhak 833705b613 Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled 2013-11-03 10:26:04 +02:00
David Nesting b368d306b9 Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07:00
Isaac Connor 93560652f1 make sortorder be asc or desc, not something arbitrary which needs to be escaped 
other fixes to use parameter passing to PDO instead of escaping them ourselves
 2013-11-01 12:30:07 -04:00
Isaac Connor 72b80d7417 remake this branch off master instead of off mysql2PDO. 
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
 2013-11-01 09:47:28 -04:00
Kfir Itzhak c2bd7c97ec First attempt at enabling out-of-source building for zm with cmake 2013-10-31 18:10:00 +02:00
Isaac Connor ae51ac5519 redo changes to use new dbFetch functions with parameter arrays 2013-10-18 14:24:08 -04:00
Isaac Connor 7fdb933d6b rework dbQuery, dbFetchOne to take a parameters array, and use it 2013-10-18 14:15:24 -04:00
Isaac Connor cde89a7144 more quoting removal, some slight optimisations 2013-10-17 21:03:24 -04:00
Isaac Connor 92591a6835 more removal of quotes 2013-10-17 17:05:50 -04:00
Isaac Connor ef765afa2d Merge branch 'master' into mysql2PDO 2013-10-17 17:02:44 -04:00
Isaac Connor 355c10c3a4 fix error when strict modes is on. 2013-10-17 17:02:17 -04:00
Isaac Connor 60e2703637 fix missing n 2013-10-17 17:01:37 -04:00
Isaac Connor 09fbdc9e35 forget the updates to this file 2013-10-17 16:57:05 -04:00
Isaac Connor 2a45506bff more quoting removal 2013-10-17 16:15:04 -04:00
Isaac Connor 0979830b91 more removal of exra quotes 2013-10-17 15:54:17 -04:00
Isaac Connor 36c4fad644 remove extra quoets since dbEcape does quoting now 2013-10-17 15:35:23 -04:00
Isaac Connor 870a59bed4 fix missing <?php. The missing full size tag makes the file fail when short tags are turned off 2013-10-17 14:23:25 -04:00
Isaac Connor 92d22b5202 Merge branch 'master' into mysql2PDO 2013-10-16 16:58:33 -04:00
Isaac Connor b126c5ae7e fix typo 2013-10-16 16:55:24 -04:00
Isaac Connor 9e2d7cfd24 initial convert to PDO with no testing 2013-10-16 16:07:58 -04:00
Kyle Johnson 7bf4de37de Merge pull request #211 from kylejohnson/master 
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
 2013-10-15 13:23:57 -07:00
kjohnson dff5b3aeb0 ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler) 2013-10-14 09:27:01 -04:00
Isaac Connor 34f84a4097 Merge branch 'v1.26.4-beta' 2013-10-03 10:14:09 -04:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00
Isaac Connor 7e91053761 increase the hegiht of the window a bit, the contents are larger 2013-09-23 10:03:33 -04:00
Knniggett 6d00540b5d Improve Chrome browser support & log streaming events 2013-09-21 14:52:41 -05:00
Isaac Connor b08a8252c4 Merge branch 'dukess-master' into v1.26.4-beta 
Conflicts:
	scripts/zmupdate.pl.in
 2013-09-18 13:03:54 -04:00
Isaac Connor c9ad6e661a Merge branch 'master' of https://github.com/dukess/ZoneMinder into dukess-master 2013-09-18 12:57:26 -04:00
Serguei S. Dukachev ed9f647dd7 Update actions.php 
SQL-ERR 'Incorrect integer value: '' for column 'Enabled' at row 1', statement was 'update Monitors set Function = 'Monitor', Enabled = '' where Id = '2''
 2013-09-13 03:48:01 -07:00
Richard Kojedzinszky 0f5c90bbe4 Rewritten the query to allow mysql to use indexes 
On a system with heavy logging, without this the login procedure took
too long.
 2013-09-12 22:46:26 +02:00
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Isaac Connor fcf7e5b188 Redo the patch that added the <0 test. Since it isn't an actual error there won't be an error message set so I've made it another case entirely. 2013-09-12 13:54:03 -04:00
Isaac Connor 0a9e63ca2c remove autogenerated files 2013-09-06 14:40:55 -04:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Kyle Johnson c02d496d23 More CakePHP cleanup - missed it in 2c04d0774f 2013-09-05 10:52:55 -04:00
Kyle Johnson d47aaec775 Merge pull request #92 from knnniggett/patch-9 
Update getBrowser() to match IE10
 2013-09-03 06:38:13 -07:00
Kyle Johnson 2f92689d7e Resolving CVE-2013-0232 - this should fix #93. 2013-08-30 21:53:19 -04:00
Andy de51926434 Update getBrowser() to match IE10 
Updates the preg_match expression to match Internet Explorer 10. The previous pattern would not detect IE10, and hence zoneminder would not attempt to stream via Cambozola, which leaves IE10 users looking at a broken link.

NOTE: There is another file in the zoneminder source tree, AssetDispatcher.php, that also uses the same pattern match expression.  It is part of the Cake folder, which I am not familiar with.  Please advise if we should edit that file as well.
 2013-08-29 17:41:20 -05:00
nagyrobi 9f1268df38 Update hu_hu.php 
This one contains updates related to all the earlier pull requests.
Had to change the entire file due to charset encoding reasons.
 2013-08-16 15:40:50 +02:00
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 8a3850ac11 Update en_gb.php 
Enable localization of the monitor function names in the console, function window and monitor settings window.

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:06:40 +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 60ea6a387d Update lang.php 
Add the ability to set up the Date and time formats by the language files, according to that language's regionals.
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.

Here we look if the constants are already defined or not, if they are not, define them to the original defaults.
 2013-08-16 12:05:33 +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 150cf5ae80 Update en_gb.php 
Added a couple of localized strings.
These need to be added to each language file too!
 2013-08-15 18:52:14 +02:00
Kyle Johnson 4d6b9f7276 More updates to the Hungarian translation. #Fixes #45 2013-08-15 09:39:45 -04: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
nagyrobi 1fa04cc104 Update hu_hu.php 2013-08-14 22:38:37 +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 a16054b33f Removed an HTML comment and changed the heading from 1 to 2. 2013-05-01 08:24:42 -03:00
Kyle Johnson 31902af09a Update README.md 2013-05-01 08:04:57 -03:00
Kyle Johnson 9d5243ccab Initial commit of Event Model, View and Controller with basic support for drilling into an event 2013-05-01 07:02:12 -04:00
Kyle Johnson 8322dc390f Initial commit of CakePHP 2.3.4 2013-05-01 06:58:31 -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 63122ab9bc Undo translations in es_es.php because its not available in the ZM 1.24.4 package. 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 33119c6dc5 1) Added image size requirements to ensure proper alignment 
2) Changed image class buffer related functions
3) Improved format selection for local cameras
4) Removed imagesize check for swscale
5) Fixed mmap unexpected memory size when changing capture options
6) Fixed unrelated bug in zmdc.pl: sockets directory doesn't exist
 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 8b86c9af58 Removed permissions check when creating new log entries. Instead check that request is 'post'ed and moved some other requests to be 'post' only. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3509 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-26 10:50:50 +00:00
stan e695dfd4dd Allow for level as a minimum when selecting availability criteria for other fields. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3501 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-24 13:15:58 +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 194d8350b4 Fixed distribution and install lists 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3497 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-05 11:24:24 +00:00
stan 62df1ba8de Tidier detainting. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3494 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-03 17:33:58 +00:00
stan aa0ee13afa Detaint further dodgy path varieties. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3488 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-03 11:08:40 +00:00
stan 63589ddee7 Don't include postprocessed config.php 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3487 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-28 21:26: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 6035ed211a Detaint some user inputs to avoid malicious file inclusion 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3483 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-22 08:37:01 +00:00
stan a3ef933f2d Check for json_last_error function existence before invoking. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3482 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-22 08:34:35 +00:00
stan b40669dc75 Updated Spanish translation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3476 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-07 08:30:12 +00:00
stan 07fca2ad9a Fixed environment fetching when in cli mode and logfile error message. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3471 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-27 16:15:59 +00:00
stan 7e55373b87 Fixed incorrect scaling of timeout on select call 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3470 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-27 16:15:16 +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 a20180aded Updated to process other sections on top of SLANG 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3362 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-25 09:13:47 +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
stan 87124001ba Added error checking to builtin JSON functions 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3351 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 15:15:37 +00:00
stan 1d84fb8f7d Added jsonDecode function and stop encoding single quotes in JSON encoder 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3350 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 13:17:12 +00:00
stan 327ae02e9a Regenerated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3340 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-16 14:48:52 +00:00
stan 24c3c068dd Removed original apache config and merged with new one in misc 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3339 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-15 21:16:36 +00:00
stan 47e8d6112a Do not ignore return status of unlink 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3326 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 11:47:25 +00:00
stan 249b53ec7e When creating a monitor add it to the current group if any 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3325 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 11:46:55 +00:00
stan 27fedec37b Reordered monitor deletion to do primary activities first in case of deletions timing out 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3324 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 10:56:39 +00:00
stan bf101660b4 Added deletePath function and changed deleteEvent to use it. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3323 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 10:54:41 +00:00
stan e46acf74b0 Fixed broken previous commit. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3322 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 09:53:33 +00:00
stan 40dfb5abde Fixed potential issues with monitor deletion 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3321 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 09:50:28 +00:00
stan 6a5f649092 Improved process control options, guesses less. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3320 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 09:35:39 +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 a1ccff276f Auto-updated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3310 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-03-02 12:35:17 +00:00
stan 0327f0f751 Added Spanish translation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3309 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-03-02 12:34:58 +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 f4ee181a1b Removed redundant overloaded code, now implmented directly in MooTools 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3298 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 11:17:30 +00:00
stan 3b149bf552 Fixed JSON encoding bug 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3292 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-11 14:48:03 +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