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
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
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
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
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
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
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
c19b71975c
Fixed issue with deleteing current monitor grouyp - http://www.zoneminder.com/forums/viewtopic.php?t=15278
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3284 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:11:56 +00:00
dae7327e7e
Fixed enable/disable monitor from monitor settings - http://www.zoneminder.com/forums/viewtopic.php?t=15273
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3283 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:08:16 +00:00
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
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
ee3c2f84a4
Removed debug
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3280 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:36:20 +00:00
255cf27e49
Removed support for PHP 4.1.0
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3279 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:31:30 +00:00
5985897a5c
Modified and improved browser checking
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3278 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:29:06 +00:00
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
173de6debf
Replaced deprecated split function call
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3276 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:28:25 +00:00
ccfdd30988
Fixed typo in error message
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3275 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:28:01 +00:00
e1a9514262
Added Estonian language
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3274 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:27:32 +00:00
4cbe2fbad9
Updated mootools version number to 1.2.5
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3270 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-31 08:54:39 +00:00
f6bcc70b0d
Updated for new tokens
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3268 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-30 21:17:50 +00:00
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
828e316885
Updated SVN header
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3226 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-17 18:20:54 +00:00
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
04dbf0f016
Renamed zmHttpd conf file to zmApache
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3219 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:30:20 +00:00
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
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
14376ac519
Updated to mootools 1.2.5
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3214 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-13 22:37:57 +00:00
192b1310b8
Adding Display language item to hungarian file. Other languages need this
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3212 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-03 17:47:00 +00:00
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
00478b3ff2
Fixed id parsing.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3209 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-28 21:27:08 +00:00
6c547aba85
Fixed use of analysis images in getImageSrc function plus fixed implementation of overwrite flag in various functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3207 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-28 21:20:02 +00:00
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
f65edd0cc1
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@3205 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-24 01:33:21 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
stan
jaidhar
stagecoach