17d7404c93
Merging master again
2014-06-28 22:50:28 +10:00
623837115b
fix missing ARRAY() around params to dbFetchOne
2014-06-25 14:01:45 -04:00
11718f0559
The users tab should always be available. It is useful to configure users BEFORE turning on auth.
2014-06-25 13:39:31 -04:00
5217bb668a
Merge remote branch 'origin/master' into video
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2014-06-06 09:25:05 +03:00
3267b59cb5
Add html5 video control to timeline and event to support mkv playback
2014-05-30 12:40:33 +10:00
df3ab025f8
Imported missing files from master to feature-h264-videostorage
2014-05-30 01:47:52 +10:00
82447ebb27
remove unwanted comment change
2014-05-17 22:05:57 +02:00
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
de107f77ba
fix option help text for overlooked languages
2014-05-17 04:51:01 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
b197f985e0
make expiry date relative (~10years)
2014-05-01 09:53:45 +02:00
ed7ca66045
make skin selection cookie persistent
2014-05-01 09:37:39 +02:00
1f29aa432a
Minor corrections to the cURL source type in the web interface
2014-04-23 12:12:41 +03:00
3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03:00
0d7c52dc1f
Merge remote branch 'origin/master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-04-17 13:26:00 +03:00
f737af15b9
Fix reload loop on switching skins
2014-04-11 09:40:23 +02:00
6c637947e2
Ability to skip frames in motion detection.
...
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
2014-04-10 14:59:34 +02:00
35468af815
Merge pull request #338 from m-bene/extendPreclusive
...
add feature to extend preclusive zone alarm state by x frames
2014-04-08 08:04:37 -05:00
9a714f8d6d
Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments
2014-04-07 16:11:48 +02:00
d6a27b31e8
fix extra }
2014-03-24 13:44:06 -04:00
bfb52ab9aa
fix groups
2014-03-21 23:10:13 -04:00
967dda737c
more copying mysql2PDO from classic. Also, some fixes in classic
2014-03-21 17:16:56 -04:00
ffa952419c
Merge branch 'mysql2PDO'
...
Conflicts:
distros/ubuntu1204/changelog
scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
web/includes/actions.php
2014-03-20 16:48:03 -04:00
2784b3d1f5
Merge master
2014-03-20 10:26:12 +01:00
2345889d64
include ExtendAlarmFrames in Presets and enable input for preclusive zones only
2014-03-20 09:53:47 +01:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
c2b93c3caf
Merge remote branch 'nagyrobi/patch-26' into nagyrobi
2014-02-26 09:32:58 -06:00
fb698a6755
Merge remote branch 'nagyrobi/patch-23' into nagyrobi
2014-02-26 09:17:14 -06:00
5b1c79e3d0
Merge remote branch 'nagyrobi/patch-22' into nagyrobi
2014-02-26 09:16:51 -06:00
1dd8dc4aa6
Merge remote branch 'nagyrobi/patch-21' into nagyrobi
2014-02-26 09:15:47 -06:00
18d56e20aa
Merge remote branch 'nagyrobi/patch-13' into nagyrobi
2014-02-26 08:46:21 -06:00
dee44c8f8d
Merge remote branch 'nagyrobi/patch-12' into nagyrobi
2014-02-26 08:45:57 -06:00
d20e0ee2e7
Temporary workaround to show all ptz control types regardless of monitor source type.
2014-02-13 08:43:19 -06:00
b2a65dc343
cURL minor corrections and improvements
2014-01-10 09:17:12 +02:00
9901ce9e84
Merge remote branch 'origin/master' into curl
2014-01-05 10:16:01 +02:00
f9c8b4760b
Merge remote branch 'origin/master' into video
2014-01-05 09:02:11 +02:00
a962815624
Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one
2014-01-05 08:59:09 +02:00
b3af313370
Merge pull request #282 from scottgrobinson/master
...
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08:00
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
bf708a8373
Merge branch 'master' into curl
...
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/zm_camera.h
src/zm_monitor.cpp
web/skins/classic/views/console.php
web/skins/classic/views/monitor.php
2013-12-27 14:21:12 +02:00
e652441996
Merge remote-tracking branch 'origin/master' into video
...
Conflicts:
configure.ac
src/CMakeLists.txt
2013-12-26 21:03:45 +02:00
375d67cdf2
Update montage.php
...
Make use of new zmMontageScale cookie
2013-12-22 20:56:18 +00:00
db41693fd6
Update montage.js
...
save montage scale % as cookie
2013-12-22 20:53:09 +00:00
8ae387e376
Few minor code improvements
2013-12-22 15:19:55 +02:00
14024451e5
Monitor link now displays for all valid libvlc paths.
2013-12-22 01:29:40 +00:00
3201e5a431
Adds web ui support for libvlc camera.
2013-12-19 21:51:39 +00:00
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
3393a63525
more updates
2013-12-17 12:53:15 -05:00
79b3f16635
add storage tab
2013-12-15 15:37:41 -05:00
f39f2fab66
Merge pull request #241 from ZoneMinder/alarmrefblendoption
...
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
2013-12-13 10:13:34 -08:00
529c124a9c
Detection Support for WansView Cams
...
Support for detection of Wansview Cams which are connected by lan
2013-12-11 11:29:30 +01:00
e9f4479171
Added support for UYVY capture palette (required for some Bluecherry cards)
2013-12-10 15:13:48 +02:00
55dadcf758
Network Detection Support for Wansview
...
Basis support for Wansview Cams
Tested with NC541W
2013-11-30 20:46:59 +01:00
1519db78ce
add ServerHost filter
2013-11-13 10:13:09 -05:00
a155082997
use parameter passing instead of esacping
2013-11-12 15:39:29 -05:00
b8f075499b
fix for debian bug #725840 Javascript errors in updateButtons function of filter.js
...
Also a slight optimisation using else's instead of continuing to evaluate after the true value has been set.
2013-11-08 11:47:19 -05:00
463d8a136f
Merge branch 'master' into mysql2PDO
...
Conflicts:
zm.conf.in
2013-11-08 11:22:09 -05:00
f73585dbaa
Few web interface corrections regarding cURL
2013-11-04 17:28:15 +02:00
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
fd656c55cf
Changed default blend percentages and the dropdown list for alarm reference image blend
2013-11-04 12:10:53 +02:00
2d0f4dffd1
Fix a missing NULL second paramter to dbFetchAll
2013-11-03 16:06:31 -05:00
59b841958d
use parameter passing instead of explicit exscaping
2013-11-03 15:40:00 -05:00
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
b368d306b9
Fix marker-out-of-bounds crash when defining zone points
2013-11-02 15:56:42 -07:00
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
ae51ac5519
redo changes to use new dbFetch functions with parameter arrays
2013-10-18 14:24:08 -04:00
cde89a7144
more quoting removal, some slight optimisations
2013-10-17 21:03:24 -04:00
ef765afa2d
Merge branch 'master' into mysql2PDO
2013-10-17 17:02:44 -04:00
355c10c3a4
fix error when strict modes is on.
2013-10-17 17:02:17 -04:00
2a45506bff
more quoting removal
2013-10-17 16:15:04 -04:00
36c4fad644
remove extra quoets since dbEcape does quoting now
2013-10-17 15:35:23 -04:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
6d00540b5d
Improve Chrome browser support & log streaming events
2013-09-21 14:52:41 -05:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
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
a186981278
Update monitor.php
...
Enable localization of the monitor function names in the monitor settings window.
2013-08-16 13:48:25 +02:00
0c098e2b0f
Update function.php
...
Enable localization of the monitor function names in the function window.
2013-08-16 13:41:33 +02:00
ff9cbeff6b
Update console.php
...
Enable localization of the monitor function names in the console.
2013-08-16 13:39:42 +02:00
9c7653ca68
Update timeline.php
...
Enable localization of the usage instructions in the Timeline window.
2013-08-15 18:58:08 +02:00
8ce4d302dd
Update montage.php
...
Enable localization of the dropdown box items in the montage window.
2013-08-15 18:56:01 +02:00
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
266b67d0bd
Support for control when monitor source is ffmpeg. This should fix #16 .
2013-08-13 08:34:37 -04:00
3a305522c4
Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
2013-07-25 11:50:24 -04:00
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
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
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
a468baf9eb
cleanup
2013-05-10 13:55:45 -04:00
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
0a3ffb5e2e
fix control types dropdown for a new monitor
2013-05-09 14:11:20 -04:00
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
2c04d0774f
Reverting my web changes in develop - keeping them in modern
2013-05-02 10:20:06 -04:00
1ed6462354
Removed all of the old web files
2013-05-01 06:52:43 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
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
a6c7acd02a
Some more progress on the deinterlacing code.
2012-07-13 20:11:16 +03:00
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
8f0ec42ba2
First work on adding built-in deinterlacing to ZM.
2012-07-13 20:11:16 +03:00
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
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
d5fbd351b3
Small corrections
2012-02-01 07:33:21 +02:00
be8ef02a7c
Small corrections
2012-02-01 07:33:21 +02:00
b4921c4403
1) Made 24bit the default target colorspace.
...
2) Changed crop info's layout.
2012-02-01 07:33:21 +02:00
066fe89718
Added automatic capture palette selection.
2012-02-01 07:33:21 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
1fad2d7ec9
Changed query separator to & 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
4cf484e8ad
Changed > to >
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2711 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:54:15 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
76345804e1
Fixed incorrect use of global
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2536 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:39:34 +00:00
f5c2733fb1
Fixed paths to montage css files and store layout as cookie
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2535 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:39:04 +00:00
0c91ea7d50
Fixed path to css
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2534 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:38:21 +00:00
ccfc7acbae
Correct path to control functions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2533 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:37:59 +00:00
33f161fede
Removed redundant MONTAGE_WIDTH/HEIGHT
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2522 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:04:09 +00:00
f7c46aa838
Fixed OLANG issues
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2521 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:03:42 +00:00
2824cb7355
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:54:50 +00:00
stevegilvarry
Isaac Connor
Kfir Itzhak
Will W
m-bene
Sune1337
Andrew Bauer
Isaac Connor
Scott Robinson
Edward Barnard
Kyle Johnson
Philipp Rehs
David Nesting
Isaac Connor
Knniggett
Isaac Connor
Kyle Johnson
nagyrobi
nextime
stan
jaidhar
stagecoach
viseon