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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
jaidhar
stagecoach