Commit Graph

2300 Commits

Author SHA1 Message Date
Isaac Connor 96322dd59c remove v4l tab that I never used 2014-07-29 14:45:02 -04:00
Isaac Connor b2f1c2fe68 Merge branch 'v4l_to_monitor' 2014-07-24 14:35:23 -04:00
Isaac Connor e065e2b3cc add V4L 2014-07-24 11:37:10 -04:00
Isaac Connor 5e262f5a67 the var is remSockFile, not remSocketFile 2014-07-24 11:05:35 -04:00
Isaac Connor b3f078eaa5 add the word disabled after function if the monitor is not enabled. 2014-07-23 15:46:37 -04:00
Jan M. Hochstein a91331de66 Added basic ONVIF support views 2014-07-14 20:59:36 +02:00
Jan M. Hochstein 0a2515c00e Added basic ONVIF support 2014-07-14 20:36:18 +02:00
Isaac Connor edd794a993 ensure captures_per_frame >0
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
Isaac Connor 9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Isaac Connor eb5f299512 increase max_socket_tries to 10 as #470 2014-07-11 10:51:24 -04:00
Isaac Connor 8f88e2a6c0 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-07-08 10:54:16 -04:00
Isaac Connor 2be38d7f32 fix problem editing users, a semi-colon screwed up the if statement.
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
2014-07-08 10:52:55 -04:00
Andrew Bauer 371c1bae3d Merge pull request #359 from knnniggett/eyezm
fix eyezm authentication issue
2014-07-07 17:57:48 -05:00
Andrew Bauer 5c8c00c1ab Fix double login issue with eyezm 2014-07-07 17:48:33 -05:00
Isaac Connor 70471936a7 get rid of escapeSql and replace it's calls with new PDO-style calls to FetchOne FetchALl,e etc 2014-07-07 10:06:50 -04:00
Andrew Bauer 48d961082c Determine full path to arp 2014-07-05 11:11:36 -05:00
Andrew Bauer c2e2a12995 Merge pull request #406 from m-bene/focusPopup
focus popup windows
2014-07-04 13:00:45 -05:00
Andrew Bauer 9a0eb63df2 Merge pull request #415 from m-bene/selectSkin
make skin selection persistent
2014-07-04 12:57:37 -05:00
Andrew Bauer 5aad658262 Fixes errors when opening Filters (issue #34) 2014-07-04 11:00:00 -05:00
stevegilvarry a8d60aa727 Fixed missing $ on ARRAY(event[id]). Fixes #455 2014-07-02 23:58:44 +10:00
stevegilvarry 61cf067be0 Wrap sort order. Fixes #450 2014-06-29 22:09:59 +10:00
Isaac Connor 623837115b fix missing ARRAY() around params to dbFetchOne 2014-06-25 14:01:45 -04:00
Isaac Connor 5fac727c2f Users tab should always be available 2014-06-25 13:40:37 -04:00
Isaac Connor 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
tim 8ac6ce17bc Fixed issue DateTime handling in filter queries that broke timeline view. 2014-06-15 13:05:25 -07:00
Isaac Connor 5bf894d263 guard against unsafe monitor name 2014-06-05 15:23:15 -04:00
Isaac Connor 0689e8453c guard against dangerous (old or new) monitor names
by rogerroger288
2014-06-05 15:21:28 -04:00
Isaac Connor baf5da9561 guard against monitor names being dangerous
by rogerroger288
2014-06-05 15:20:04 -04:00
Isaac Connor 5ae3cb8907 merge some security fixes from rogerroger288 2014-06-05 15:14:12 -04:00
Kfir Itzhak 5fea101294 Merge pull request #421 from m-bene/ffmpegoptions
Add optional options field for ffmpeg and VLC source types
2014-05-18 18:07:42 +03:00
m-bene 82447ebb27 remove unwanted comment change 2014-05-17 22:05:57 +02:00
m-bene a81b9b8ce2 change examples for options 2014-05-17 21:48:08 +02:00
m-bene f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene de107f77ba fix option help text for overlooked languages 2014-05-17 04:51:01 +02:00
m-bene 9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
m-bene ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
m-bene b197f985e0 make expiry date relative (~10years) 2014-05-01 09:53:45 +02:00
m-bene ed7ca66045 make skin selection cookie persistent 2014-05-01 09:37:39 +02:00
Isaac Connor 8da9383d5d use PDO style 2014-04-30 10:09:27 -04:00
Isaac Connor e94fca2778 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-04-30 10:01:29 -04:00
Isaac Connor b3226223f8 remove uses of dbEscape 2014-04-30 10:01:10 -04:00
Kfir Itzhak ec5784abe2 Fix wrong install path for core.php and database.php 2014-04-30 12:25:42 +03:00
Kfir Itzhak afd4e451fd Add the web/api folder to cmake 2014-04-30 12:16:46 +03:00
Kyle Johnson 40e929e7a6 Changed the API readme to be ZoneMinder-relevant 2014-04-29 20:49:54 +00:00
Kyle Johnson f1f3de6d7d Moved the api to underneath the web directory 2014-04-29 20:41:04 +00:00
m-bene 28f62c4f8f remove call of undefined "fixDevices" function 2014-04-26 04:23:36 +02:00
m-bene 2881e6b643 focus popup windows 2014-04-26 04:07:33 +02:00
Kfir Itzhak 1f29aa432a Minor corrections to the cURL source type in the web interface 2014-04-23 12:12:41 +03:00
Kfir Itzhak 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
Kyle Johnson fd4f77b145 Merge pull request #381 from m-bene/flatLayout2
Fix window sizes and input field sizes for flat skin
2014-04-18 09:40:00 -04:00
Kyle Johnson 4b7f1896b9 Merge pull request #385 from maciekczwa/master
fix sql error which prevents remote login from working
2014-04-18 09:39:09 -04:00
Maciej Czerniak 50a9055601 fix sql error which prevents remote login from working 2014-04-13 09:54:11 +02:00
m-bene b56093a637 Fix window sizes and input field sizes for flat skin 2014-04-11 09:53:46 +02:00
m-bene f737af15b9 Fix reload loop on switching skins 2014-04-11 09:40:23 +02:00
Sune1337 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
Kyle Johnson db5a8fe194 Merge pull request #375 from m-bene/flatLayout
Fix small / cropped DRV controls in event view.  Fixes #356
2014-04-09 16:45:15 -04:00
m-bene bd5e25644e same dvr controlls in event as in monitor 2014-04-09 20:19:23 +02:00
Andrew Bauer 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
m-bene f22b956b8b do not quote column names in parse filter 2014-04-08 09:07:59 +02:00
m-bene 9a714f8d6d Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments 2014-04-07 16:11:48 +02:00
m-bene 9edb55d9af Modify window size to exclude task bar area 2014-04-07 12:07:29 +02:00
Andrew Bauer fec72f05d0 fix eyezm authentication issue 2014-03-25 18:48:20 -05:00
Isaac Connor d6a27b31e8 fix extra } 2014-03-24 13:44:06 -04:00
Isaac Connor 957d6f123f remaining conversions 2014-03-22 14:16:56 -04:00
Isaac Connor bfb52ab9aa fix groups 2014-03-21 23:10:13 -04:00
Isaac Connor 967dda737c more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
Isaac Connor c7a8c0601b wip 2014-03-21 16:51:09 -04:00
Isaac Connor 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
m-bene 2784b3d1f5 Merge master 2014-03-20 10:26:12 +01:00
m-bene 2345889d64 include ExtendAlarmFrames in Presets and enable input for preclusive zones only 2014-03-20 09:53:47 +01:00
Andrew Bauer a9c83b5e71 Merge pull request #342 from knnniggett/nagyrobi
Mostly Translation related changes
2014-03-15 08:08:09 -05:00
m-bene 26777487dc add feature to extend preclusive zone alarm state by x frames 2014-03-09 17:05:39 +01:00
Kyle Johnson 5a2009a143 Fix popup sizes in flat skins. Fixes #331 2014-03-03 21:26:18 -05:00
Andrew Bauer 03ded1edd0 Merge remote branch 'nagyrobi/patch-2' into nagyrobi
Conflicts:
	web/lang/hu_hu.php
2014-02-26 09:37:41 -06:00
Andrew Bauer c2b93c3caf Merge remote branch 'nagyrobi/patch-26' into nagyrobi 2014-02-26 09:32:58 -06:00
Andrew Bauer 9a298a2af2 Copy nagyrobi's localization changes from en_gb verbatim to the other language files. 2014-02-26 09:30:57 -06:00
Andrew Bauer c119c49cd9 Merge remote branch 'nagyrobi/patch-25' into nagyrobi 2014-02-26 09:21:38 -06:00
Andrew Bauer fb698a6755 Merge remote branch 'nagyrobi/patch-23' into nagyrobi 2014-02-26 09:17:14 -06:00
Andrew Bauer 5b1c79e3d0 Merge remote branch 'nagyrobi/patch-22' into nagyrobi 2014-02-26 09:16:51 -06:00
Andrew Bauer 1dd8dc4aa6 Merge remote branch 'nagyrobi/patch-21' into nagyrobi 2014-02-26 09:15:47 -06:00
Andrew Bauer f435435481 Merge remote branch 'nagyrobi/patch-17' into nagyrobi 2014-02-26 09:15:05 -06:00
Andrew Bauer b4679f0a8c 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.

These definitions are removed from here and added with checking option to the later stage after loading the language files.
2014-02-26 09:14:04 -06:00
Andrew Bauer 805981e06a Merge remote branch 'nagyrobi/patch-4' into nagyrobi
Conflicts:
	web/skins/classic/js/skin.js
2014-02-26 09:04:19 -06:00
Andrew Bauer 18d56e20aa Merge remote branch 'nagyrobi/patch-13' into nagyrobi 2014-02-26 08:46:21 -06:00
Andrew Bauer dee44c8f8d Merge remote branch 'nagyrobi/patch-12' into nagyrobi 2014-02-26 08:45:57 -06:00
Andrew Bauer 5ac8a5cc99 New localization strings from Nagyrobi copied verbatim from en_gb 2014-02-26 08:38:47 -06:00
Andrew Bauer 0258579ef3 Merge remote branch 'nagyrobi/patch-10' into nagyrobi 2014-02-26 08:25:16 -06:00
Andrew Bauer 4196783d97 Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts. 2014-02-26 07:56:31 -06:00
Andrew Bauer c899de65a4 Merge remote branch 'nagyrobi/patch-5' into nagyrobi 2014-02-26 07:55:36 -06:00
Andrew Bauer 26be1bd041 Fix builtin authentication issue caused by commit 6e5d927 2014-02-14 18:56:27 -06:00
Andrew Bauer d20e0ee2e7 Temporary workaround to show all ptz control types regardless of monitor source type. 2014-02-13 08:43:19 -06:00
Kyle Johnson 6e9da046b8 Fixed additional Makefile.am pointing to classic skin in flat skin 2014-01-27 14:26:03 -05:00
Kyle Johnson 6f5c9182ce Add paths to flat skin in configure.ac and Makefile.am 2014-01-24 13:58:51 -05:00
Andrew Bauer 4fe4a028f6 Update Makefile.am
Add flat skin to makefile
2014-01-23 14:29:35 -06:00
Justin Lawrence e8f831c055 Flat theme: rename new theme from classic copy to flat 2014-01-22 16:33:40 +02:00
Justin Lawrence 23f69de826 Flat theme: css changes 2014-01-22 16:32:14 +02:00
Justin Lawrence ce825067a8 Flat theme 2014-01-22 16:24:06 +02:00
Kfir Itzhak b2a65dc343 cURL minor corrections and improvements 2014-01-10 09:17:12 +02:00
Kfir Itzhak 9901ce9e84 Merge remote branch 'origin/master' into curl 2014-01-05 10:16:01 +02:00
Kfir Itzhak 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
Isaac Connor 6e5d9272e0 supposed to fix #296 2014-01-03 18:33:01 -05:00
Isaac Connor b3af313370 Merge pull request #282 from scottgrobinson/master
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08:00
Adam J. Henry e6b9b8218b Enclose value of the Notes attribute with quotes. 2013-12-31 17:32:20 -06:00
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02:00
Kfir Itzhak 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
Kfir Itzhak 89cfb96855 Merge pull request #277 from ebarnard/libvlc
Add libVLC source type
2013-12-22 13:01:19 -08:00
Scott Robinson 375d67cdf2 Update montage.php
Make use of new zmMontageScale cookie
2013-12-22 20:56:18 +00:00
Scott Robinson db41693fd6 Update montage.js
save montage scale % as cookie
2013-12-22 20:53:09 +00:00
Isaac Connor 7b26636bcd Merge pull request #280 from ZoneMinder/zmfixremoval
Remove zmfix
2013-12-22 11:22:18 -08:00
Miklos Marton 5de638214b In the web/includes/functions.php there were some html formatting errors in the outputVideoStream function.
These errors were:
- Unclosed object and embed tags
- param tags without closing tags

These errors lead to rendering errors when using the mobile skins with some specific streaming options.
2013-12-22 15:17:21 +01:00
Kfir Itzhak e9bb632a78 Remove zmfix 2013-12-22 16:08:17 +02:00
Edward Barnard 14024451e5 Monitor link now displays for all valid libvlc paths. 2013-12-22 01:29:40 +00:00
Edward Barnard 3201e5a431 Adds web ui support for libvlc camera. 2013-12-19 21:51:39 +00:00
Isaac Connor 0c58957e04 fixes 2013-12-17 14:58:06 -05:00
Isaac Connor 003b8c9868 more removal of escaping 2013-12-17 14:38:08 -05:00
Isaac Connor 9f5b8bb03b Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO 2013-12-17 14:33:46 -05:00
Isaac Connor 20f1b460ee fix 2013-12-17 14:30:56 -05:00
Kyle Johnson cad33ddb96 Removed embedded jquery, instead include by <script>. Fixes #274 2013-12-17 13:41:55 -05:00
Kyle Johnson 1a744ebed6 Added jquery 1.4.2.min.js to the classic skin's js dir 2013-12-17 13:41:36 -05:00
Isaac Connor 3393a63525 more updates 2013-12-17 12:53:15 -05:00
Isaac Connor 4c348cf159 more updates 2013-12-17 11:16:20 -05:00
Isaac Connor ceca805b48 more updates 2013-12-17 11:07:19 -05:00
Isaac Connor 1c028e5806 use parameter passing and remove extra escsaping 2013-12-16 16:52:30 -05:00
Kyle Johnson 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
Philipp Rehs 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
Kfir Itzhak e9f4479171 Added support for UYVY capture palette (required for some Bluecherry cards) 2013-12-10 15:13:48 +02:00
Isaac Connor 00e2b05130 Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO 2013-12-06 15:52:43 -05:00
Isaac Connor a2a3bda2e1 remove unneccessary quoting and escaping 2013-12-06 15:51:36 -05:00
Isaac Connor 86b04d0e6f fixup dbFetchMOnitor 2013-12-06 14:22:07 -05:00
Kfir Itzhak 5a256eb96f Merge pull request #256 from Phhere/patch-1
Fix checkJsonError messages
2013-12-04 04:58:39 -08:00
Kfir Itzhak 219ada85c0 Merge pull request #257 from Phhere/patch-2
Network Detection Support for Wansview
2013-12-01 16:04:56 -08:00
Kfir Itzhak 23ff4023bd Removed installation of web/README.md from cmake 2013-12-02 01:53:21 +02:00
Kfir Itzhak 783bf4b8ab Fixed web/skins/*/includes/config.php not being installed 2013-12-02 01:52:26 +02:00
Philipp Rehs 55dadcf758 Network Detection Support for Wansview
Basis support for Wansview Cams
Tested with NC541W
2013-11-30 20:46:59 +01:00
Philipp Rehs d4babd23f1 Fix checkJsonError messages
The $value string was not set inside checkJsonError, so it was not possible to see the data which caused the error
2013-11-30 18:13:02 +01:00
Kfir Itzhak 55ea6745f1 Revert "Correctly fix mootools symlinks being installed twice in cmake this time"
This reverts commit 89689d8f3f.
2013-11-22 23:50:59 +02:00
Kfir Itzhak 89689d8f3f Correctly fix mootools symlinks being installed twice in cmake this time 2013-11-22 20:23:58 +02:00
Kfir Itzhak 17129cf078 Fix minor bug introduced by commit cfc9a73851: Do not install mootools symlinks twice for out-of-source installations 2013-11-17 15:15:54 +02:00
Isaac Connor e4ea12a5ca Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO 2013-11-13 10:13:42 -05:00
Isaac Connor 1519db78ce add ServerHost filter 2013-11-13 10:13:09 -05:00
Isaac Connor 969918781f more updates, currently the log updates are not enough. Filtering does not work. 2013-11-13 10:11:16 -05:00
Kfir Itzhak 91d42a86cf Merge branch 'cmakemootoolsfix' 2013-11-13 16:59:46 +02:00
Kfir Itzhak 47179f793d Fix make install failing to install mootools symlinks in an out-of-source build 2013-11-13 16:52:01 +02:00
Isaac Connor a155082997 use parameter passing instead of esacping 2013-11-12 15:39:29 -05:00
Kfir Itzhak cfc9a73851 Fixed not installing mootools symlinks in an out-of-source build 2013-11-08 18:54:46 +02:00
Isaac Connor 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
Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO
Conflicts:
	zm.conf.in
2013-11-08 11:22:09 -05:00
Isaac Connor 03809cfa0f improve error reporting 2013-11-07 10:58:27 -05:00
Isaac Connor 4c6c415f02 fix: wrote dbCon instead of dbConn 2013-11-07 10:03:19 -05:00
Kfir Itzhak be21a882ab Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
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
stan 240027dd98 Fixed javascript error due to archive button permissions - http://www.zoneminder.com/forums/viewtopic.php?t=15387
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3286 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:17:42 +00:00
stan 45f1ee9c36 Fixed restricted user not being able to select a monitor in console - http://www.zoneminder.com/forums/viewtopic.php?t=15347
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3285 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:14:16 +00:00
stan 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
stan 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
stan 48d287f9de Fixed bug where unarchiving multiple events would not work - http://www.zoneminder.com/forums/viewtopic.php?t=15272
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3282 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:06:44 +00:00
stan 98203e6c2f Improved stream handling for single image mode, for Chrome etc.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3281 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:04:11 +00:00
stan 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
stan 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
stan 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
stan 1027b1c75b Prevented memory exhaustion in timeline view for very long events
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3277 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:28:49 +00:00
stan 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
stan 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
stan 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
stan 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
stan 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
stan 5203205680 Improved formatting of options and help.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3229 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-20 18:38:24 +00:00
stan 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
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
stan 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
stan dc9e2755b0 Added sample apache config file.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:27:58 +00:00
jaidhar 1a8d7c46fc XML Plugin: Bugfix where EVENT_IMAGE_DIGITS other than 3 would not work. Now uses define
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

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

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

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

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

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

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

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

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

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

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

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

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



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

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

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

to

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

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

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

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

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3129 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-09-29 00:55:10 +00:00
stan 0cdc6e89ef Added utility function
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3065 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-05-27 12:18:06 +00:00
stan 60f0136ed3 Merged in image root changes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 19:16:40 +00:00
stan 255c311ef1 Updated by autoconf/automake
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3038 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 17:39:38 +00:00
stan 2b375ef264 Changes to querying and probing.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3037 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 17:38:30 +00:00
stan ac0e0c9ca6 Fixed typo in Quicktime video
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3033 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 10:41:04 +00:00
stan 9b31bf29e8 Added in image view to allow event root to be able web root
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:12:12 +00:00
stan 1432bbed60 Changed splitcalls to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3030 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:10:36 +00:00
stan a9c2044669 Changed split and ereg calls to explode and preg_match
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3029 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:00:31 +00:00
stan 4f0c4cced0 Changed use of deprecated split function to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3025 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:11:58 +00:00
stan 63988218a7 Changed use of deprecated split function to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3024 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:11:37 +00:00
stan 6f464e7152 Changed use of deprecated split function to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3023 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:11:17 +00:00
stan 6659797e7d Changed use of deprecated split function to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3022 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:10:38 +00:00
stan bac71436fd Changed use of deprecated split function to explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3021 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:10:10 +00:00
stan 84e6d5142a Seyi export bug fix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3020 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:09:29 +00:00
stan aeee1aff69 Changed calls of deprecated split function to use explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3019 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:09:07 +00:00
stan 5696516092 Updated Italian translation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3010 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-01-14 10:12:11 +00:00
stan 160c0d4fa2 Log missing view or request files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2990 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-19 08:13:07 +00:00
stan 266e669dde Modified console filters to include archived events and fixed filters for timeline zooming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2989 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-20 21:36:17 +00:00
stan f57480a6fe Correctly location of favicon for mobile skin
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2988 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-18 20:15:49 +00:00
stan 3ce4caa8e4 Corrected incorrect use of request variable
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2987 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-18 17:55:52 +00:00
stan 97ba7a6684 Corrected some Mootools issues, autoCancel => link: cancel and onComplete => onSuccess. Also fixed montage alarm state class handling
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2986 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:13:16 +00:00
stan c2e251405e Tweaked request timeout handling
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2985 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:11:29 +00:00
stan 128fb0b07b Fixed montage css behaviours
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2984 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:10:41 +00:00
stan 2b519225dd Fixed CSS typos
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2983 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:10:07 +00:00
stan 1fad2d7ec9 Changed query separator to &amp; and miscellaneous html fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:09:16 +00:00
stan 6fc7acb378 Changed query separator to &amp; and added CDATA wrapper.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2981 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:04:44 +00:00
stan 00d007cdf2 Fixed formatting.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2980 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 18:16:34 +00:00
stan a32d9e5fbc Updated Makefiles
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2979 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 17:49:26 +00:00
stan e0801bc216 Updated to use mootools 1.2.3
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2978 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 17:38:13 +00:00
stan 64b5290d14 Fixed broken link on time display
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2972 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 09:40:49 +00:00
stan b7405349c1 Removed bogus non-filter parameter
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2967 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-08 20:20:06 +00:00
stan 93b955813f Further PTZ preset tweaks
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2958 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 14:16:17 +00:00
stan 1e2ecf0947 Updated Makefiles
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2957 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 13:35:23 +00:00
stan c5a0f98309 Factored out action and request control functionality. Added presets to mobile view for PTZ cams.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2956 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 13:34:10 +00:00
stan d77c2a48bd Updated from forum.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2934 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-29 09:52:48 +00:00
stan 8cad0dbd6a Updated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-24 10:27:28 +00:00
stan d529a079df Fixed typo.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2930 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-22 11:23:28 +00:00
stan 11a1cc2d41 Now supports custom perl install path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +00:00
stan 3c10237833 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-05-28 08:47:59 +00:00
stan 034f37cf4b Applied contributed patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-25 18:03:46 +00:00
stan c652b358d7 Fixed issue with bogus empty lines after closing php tag.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2889 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-24 10:00:20 +00:00
stan 6d19aa8742 Removed blank lines.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2872 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-13 10:58:00 +00:00
stan e5005b03b2 Fixed missing tag close.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2871 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-13 10:48:58 +00:00
stan e69489e841 Changes to stills event view for IE etc
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2866 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 11:21:28 +00:00
stan eaaaf88493 Applied 'mitch' IE compatibility patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2865 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 10:04:12 +00:00
stan 282a542a6a Ignore unparseable arp output.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2862 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-06 09:49:30 +00:00
stan d3787426f9 Fixed problem with 1 pixel gap in continuous events strip.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2861 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-06 09:49:09 +00:00
stan 9116927ca2 Removed extranrous quote.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2860 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-06 09:48:01 +00:00
stan ce8e120765 Fixed undefined filterData when saving filters.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2847 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 10:13:06 +00:00
stan 6f89730f2e Fixed mootools extension.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2846 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-04 21:59:52 +00:00
stan 56d87a15bc Temporary checkin to disable mootools recursion issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2845 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-04 21:35:42 +00:00
stan 72f908c4e7 Changed streaming to dynamically reduce frame rates if streams are sent too slowly. Made low bandwidth montage more resilient.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2844 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:10:54 +00:00
stan 09bf78f865 Removed the stream scaling command as kills FireFox now.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2843 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:08:57 +00:00
stan bc8ba5d490 Changed extentsion of Request to mootools v1.2 format
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2842 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:07:45 +00:00
stan 41f90e44ab Removed weird line endings.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2841 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:06:45 +00:00
stan fa5db09a73 FIxed issues with negative FPS affecting streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2839 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 19:39:23 +00:00
stan 1edb48f358 Updated makefiles.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2838 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 09:06:12 +00:00
stan db81975d29 Fixes the standalone control view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2837 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 08:37:10 +00:00
stan dc42b4a83b Further mootools mods and slightly enlarged event view
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2836 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 08:01:49 +00:00
stan 93d1cf8ed2 Updated makefiles
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2835 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 14:10:04 +00:00
stan b044291233 More mootools 1.2 migration mods.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2833 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 14:06:13 +00:00
stan 595f303870 Updated with new probe settings.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2830 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 13:01:52 +00:00
stan 62503acd16 Added monitor probe facility
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2829 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 13:00:49 +00:00
stan f5d7391e72 Changed Object reference to Hash for mootools 1.2
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2828 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 13:00:20 +00:00
stan 54dc3b9668 Improved monitor naming checks and validation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2826 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 10:55:19 +00:00
stan 545ca029e3 Added next auto inc function
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2825 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 10:53:51 +00:00
stan 3310ea3ae9 Added V4L version to presets and generic PAL/NTSC standards
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2823 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 12:00:14 +00:00
stan fc2a20bd5f Further mootools migration
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2822 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 08:56:31 +00:00
stan 2956b4bf14 Fixed issues with monitor creation/updating.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2821 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 08:56:15 +00:00
stan 7b4c0fa926 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2820 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-03-27 16:01:59 +00:00
stan cfccc4b9bf Updates to event export and javascript fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2814 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-27 09:14:54 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:59:13 +00:00
stan 3069dc2402 Final timestamp update
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:32:04 +00:00
stan 133c9acfa0 Fixes and tweaks for filter view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2800 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:28:45 +00:00
stan 73ad3a7097 Changed types/order of stream status structs to work on 64 bit systems.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2797 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-08 14:34:09 +00:00
stan 8613dc8f81 Updated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2796 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-08 11:14:41 +00:00
stan f512cd91e7 Fixed issue with 'set' values.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2793 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-03 17:50:31 +00:00
stan e6530eda40 Added/update Chinese language files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2792 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-03 17:48:41 +00:00
stan 57f8127498 Slight revamp
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2782 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:17:33 +00:00
stan 61089eeeb1 Added authentication hashed logins.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:06:39 +00:00
stan 269306bc67 Fixed reordering down link issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2780 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 10:05:31 +00:00
stan 66a19fe99b Fixed control preset issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2779 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 09:45:29 +00:00
stan 2f9524d00e Fixed issue with default mobile view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2761 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:12:15 +00:00
stan e3dce264e0 Fixed issue with exporting. Typo plus over-escaping.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2759 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 22:44:37 +00:00
stan 8cc598d2f8 Fixed issue with default V4L version being v2 but default options displayed were for v1
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2758 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 22:44:11 +00:00
stan 411952c3c7 Updated for 1.24.0
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2746 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:39:12 +00:00
stan 22f22baa32 Updated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2745 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:38:43 +00:00
stan c3fcf0a1e9 Added to SVN
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2744 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:24:07 +00:00
stan 8560a5811c Corrected sub-reference to language file.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2743 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:17:26 +00:00
stan e7955b81a7 Removed dodgy indentation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2742 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:17:09 +00:00
stan 20b7b21100 Update Swedish language file.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2741 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-05 14:57:23 +00:00
stan 847606a200 Fixed further with editng control capabilities
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2737 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-30 17:43:29 +00:00
stan 19ddc42f4b Fixed bogus reference to $control
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2735 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 17:44:32 +00:00
stan c2cf6e31bc Fixed issue with control edit screen losing changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2734 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 17:25:05 +00:00
stan cdc31b0e6d Reduced initial events list load time.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2732 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 14:14:41 +00:00
stan 56b5099c4c Added window size for frame view
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2731 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 14:14:25 +00:00
stan e0310c0760 Commented out some V4L2 palette options.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2730 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 12:50:58 +00:00
stan e14efbd493 Updated generated files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:24:01 +00:00
stan 21d8d74a28 V4L2 updates
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2723 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-27 11:07:24 +00:00
stan b3b226ebe1 Changed labels to work better with ffmpeg monitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2720 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-21 17:45:30 +00:00
stan 23d82a7e03 Added FFMPEG camera type
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:01:32 +00:00
stan d43d2289ed Changes from updated build tools.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 14:54:50 +00:00
stan 69f6270171 Fixed issue with X10 web commands.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2712 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-05 14:37:26 +00:00
stan 4cf484e8ad Changed > to &gt;
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2711 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:54:15 +00:00
stan 549aa39cbb Updated autoconf/make files
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:05:56 +00:00
viseon 2419b6582e Handle errors returned from Ajax more gracefully.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2709 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:58:58 +00:00
viseon f2ad7cc770 Add offset to replay_rate to make it unsigned
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2708 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:56:15 +00:00
viseon 5d766dde92 Remove decorations from Cambozola applet and escape line endings in json values.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2707 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:44:43 +00:00
viseon b8781904ca Baselined rates and scales to base, replay_rate now short int.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2706 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:42:35 +00:00
stan 69b9f78343 Added associate fetch function.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2705 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:15:08 +00:00
stan 105c51b975 Adde in missing rename of showControls.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2696 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 19:06:35 +00:00
stan 276533129d Made DVR control appearance conditional on replay buffer being set
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2694 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:46:32 +00:00
stan 50f60ab9d8 Added in conditional regexp http support
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2693 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:45:01 +00:00
stan f06b6cf60b Added in define for prescence/abscence of libpcre
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2692 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:41:14 +00:00
stan 6d78b17d90 Added CMD_VARPLAY to stream commands
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2687 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:16:47 +00:00
viseon 287517a84f Actually added Notes to Events instead of Event
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2686 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:16:02 +00:00
viseon 8d42ead4d2 Added Notes to retrived Ajax event fields
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2685 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:15:02 +00:00
viseon 59b9f622d8 Strip out cr/lfs from JSON values
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2684 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:14:35 +00:00
stan 7d96edeacd Added .in files to svn
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2681 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 12:14:50 +00:00
stan e60149ce36 Modification to streaming to avoid making stream buffer if not required. Also cycle fix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2679 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-29 23:08:21 +00:00
stan b7f97d388f Added configuraion and detection of V4L2 to web interface.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2678 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 14:25:12 +00:00
stan 9201e1319d Fixed some php warnings.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2677 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 14:24:46 +00:00
stan 9725a76371 Added default scale to getImagePath
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2673 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 12:49:04 +00:00
stan 012ac787f6 Fixed filter execution issues.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2669 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-20 08:25:24 +00:00
stan 81fd3aaa41 Restructured ajax to be consistent.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2668 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-16 16:12:23 +00:00
stan dc25beb8e4 Fixed MIME type issues.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2664 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-14 12:55:27 +00:00
stan ce58beb903 Fixed issues with filters
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2662 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-14 12:13:55 +00:00
stan c561a238a0 Fixed issues with event responses
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2661 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-14 12:13:44 +00:00
stan 3663ea922b Better handling of view only priveleges
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2658 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-09 09:15:53 +00:00
stan 0a9298dbbe Various web bugs fixed
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2651 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-07 09:02:17 +00:00
stan 31d349124d Fixed with montage when groups empty
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2649 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 20:07:22 +00:00
stan d2856ed019 Fixed issues with control capabilities and moveMap on watch view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2648 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:58:13 +00:00
stan 3714e5175c Remove redundant initialisation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2647 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:17:28 +00:00
stan 7f7ba4d605 Fixed issue with incorrect monitor count in console
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2646 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:16:45 +00:00
stan 8575b5f21a Added mootols to distro
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2644 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:06:59 +00:00
stan 1080485c33 Motage and event list issues, fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2642 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 15:29:14 +00:00
stan 8af774a98c Fixes and patches.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2641 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 08:41:23 +00:00
stan 323338b661 Applied Corey patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2640 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 13:15:13 +00:00
stan 5bfe4b72c7 Fixed typo.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2637 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 11:42:59 +00:00
stan bec3dc9ff6 Fixed options issues including missing restart arning.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2636 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 08:55:25 +00:00
stan d4b0eaa554 Timeline revisions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2635 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 08:16:34 +00:00
stan ef8f7b85fd Continuing development and bugfixes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-26 09:47:20 +00:00
stan ba788cc001 Fixed issues with creation, editing and deletion of monitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2626 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 16:43:34 +00:00
stan 31a0762d9e Fixed issues with remote method not being preserved.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2622 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:59:02 +00:00
stan 45190dee61 Fixed options and user editing issues.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2621 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:05:06 +00:00
stan 59ba3d4782 Whitespace
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2620 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:04:35 +00:00
stan 0c2edfef4a Corrected selection of LinkedMonitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2619 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:03:52 +00:00
stan 64987d9399 Fixed incorrect assignment of empty user.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2618 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:03:01 +00:00
stan 2133e94945 Omit Options link if permission insufficient.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2617 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 13:58:27 +00:00
stan b8d9bd68c2 Fixed null view file
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2616 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 12:39:24 +00:00
stan d6fc2d0cd5 Fixed display or error page.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2614 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-08-03 15:05:33 +00:00
stan bb2f87a6f0 Corrected undefined index warnings.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2613 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-08-03 15:04:44 +00:00
stan 106882c161 Updated copyright notices
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:48:16 +00:00
stan 0f0a8c004f Changed skinSeq to skinBase
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2596 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-23 09:57:11 +00:00
stan 5789f6a38e Fixed to work with overriden skins
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2591 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-22 16:24:36 +00:00
stan b1c61a9eac Made all but base point size proportional
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2590 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-22 16:23:49 +00:00
stan 3fc9360255 Fxed MaxFPSs defaulting to 0.00 when not set.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2589 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 21:28:50 +00:00
stan 62a8d6f9bc Enlarged filter window.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2588 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:58:13 +00:00
stan 6880f9e2bb Removed unrequired Colours field
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2585 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:24:46 +00:00
stan 77fd8dafbf Added in better colour/palette initialisation for new monitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2581 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:19:25 +00:00
stan 78f7038dc2 Fixed problem with options help and globals
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2576 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-18 15:01:38 +00:00
stan e10bd0c3e4 Fixed tabs
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2575 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-18 14:54:10 +00:00
stan 03c66f87ef Fixed up tabs
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2574 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-18 14:53:44 +00:00
stan 44c54837c3 Fixed checkbox clearing not working and xhtml errors in layout.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2573 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-17 16:59:25 +00:00
stan 7e40dc663c Fixed canStreamApplet function call cockup
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2572 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 16:47:56 +00:00
stan 8326e0d62e Fixed js issues with IE
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2571 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 16:20:25 +00:00
stan 0a20de9c1f Set button states on editing a monitor
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2570 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 16:03:53 +00:00
stan 58c861cd67 Fixed function call error
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2569 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:56:48 +00:00
stan 4d71f97fb8 Formatting of th elements
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2568 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:52:22 +00:00
stan abaf825c95 Removed temp debug
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2567 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:52:09 +00:00
stan a65ab058db Added simpler status query for still images
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2566 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:47:33 +00:00
stan acc47c04c9 Renaming and suppressed errors from sendto in case socket not open
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2565 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:19:12 +00:00
stan 8418c4148e Removed php code
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2564 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:18:40 +00:00
stan 19fe97a8ca Cosmetic change
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2563 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 14:03:18 +00:00
stan b78f172803 Removed further redundant classes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2562 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:42:50 +00:00
stan 1041bbc036 Eliminated bighead and smallhead classes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2561 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:32:37 +00:00
stan 9e90f0971a Added ZM_BASE_PATH, may not be necessary though.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2560 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:23:32 +00:00
stan 40393e50aa Moved calendar path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2559 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:22:22 +00:00
stan 8107c93933 Changed OPT_MPEG to OPT_FFMPEG
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2558 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:21:26 +00:00
stan d83525cf76 New paths to mootools and favicon. Reset.css not just screen media.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2557 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:18:05 +00:00
stan 37562208b6 Removed some redundant css definitions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2556 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:17:26 +00:00
stan cd2f1ea795 Fixed for new path to skin graphics
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2555 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:16:57 +00:00
stan fad6b0ec11 PTZ control restructuring.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2554 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:16:19 +00:00
stan 336ce62c15 Reorganised PTZ controls and layout somewhat
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2553 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:15:28 +00:00
stan 4874433558 Moved favicon to graphics dir
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2552 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:14:19 +00:00
stan d840a3e4f2 Fixed up properties
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2551 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:13:17 +00:00
stan 8b3ceb506b Moved PTZ graphics
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2550 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:06:21 +00:00
stan 1d0d430bb6 Moved favicon to graphics dir
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2549 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:06:07 +00:00
stan 57fa598fd8 Removed session_write_close calls and fixed monitor action
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2545 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:44:39 +00:00
stan d6f85862ac Fixed path to export functions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2544 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:43:29 +00:00
stan eeea85bf7b Removed spacer gif as not required.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2543 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:43:10 +00:00
stan decaf0ef31 Fixed broken default user reference
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2542 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:42:28 +00:00
stan e7c025712a Fixed path to export functions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2541 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:53 +00:00
stan 5e4a953dcd Adjusted layout
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2540 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:37 +00:00
stan 5c9e835c73 Corrected error in configureButtons function
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2539 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:21 +00:00
stan a04b2b4f85 Corrected comments and added skin path as global js variable
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2538 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:40:53 +00:00
stan bfd67f69fd Fixed to work properly with MPEG cameras and presets
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2537 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:40:21 +00:00
stan 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
stan 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
stan 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
stan 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
stan aed786dd0e Fixed unquoted array indexes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2529 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:24:31 +00:00
stan 4f67ddd94a Fixed language selection
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2528 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:24:14 +00:00
stan 0c4b4ba445 Merged in changes from Axis MPEG
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2527 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:20:46 +00:00
stan 95ac7dadb3 Fixed headerControl div positioning
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2523 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:04:45 +00:00
stan 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
stan 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
stan c58b322a6e Merged in mpeg_encode removal
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2520 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 15:56:52 +00:00
stan 81065ba6dd Removed learn state bits
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2510 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:42:20 +00:00
stan 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
stan f2cd98f99b Updates
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2507 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:37:06 +00:00
stan 5621a3f283 Added retry on timeouts
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2505 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:31:47 +00:00
stan c617a8436c Bug 434 - Added delete functionality back into DVR events view plus enhanced events scrolloing etc to support.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2391 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-21 13:52:05 +00:00
stan 44943e21e9 Bug 477 - Switched device height and widths to be correct.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2388 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 14:02:53 +00:00
stan 2cba5c3ecc Bug 66 - Fixed 'prev' link in watch view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2387 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 14:01:20 +00:00
stan d2c3591925 Changed 100's to SCALE_BASE where appropriate
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2386 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 13:35:20 +00:00
stan 2549d98d1f Bug 476 - Added pagination at bottom of events list as well as top.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2385 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 13:34:46 +00:00
stan 4c452c22c3 Bug 470 - Fixed some anachronistic control script references
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2344 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:43:48 +00:00
stan 002978a761 Indentation changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2343 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:43:18 +00:00
stan 5335397f58 Bug 469 - Filter queries were urlencoded twice.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2341 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:37:52 +00:00
stan 5ea3f88b18 Bug 463 - Moved xhtml header emission into each file to avoid inadvertent prepending of video downloads. Also autogenerate mime-type.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2314 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-20 23:11:25 +00:00
stan a426ed3d05 Bug 449 - Fixed typo in config name
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2309 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 23:44:06 +00:00
stan 4ce40854ee Cosmetic - Removed surplus space
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2304 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 22:42:33 +00:00
stan f786d38334 Bug 459 - Removed duplicate frame image
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2303 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 22:41:58 +00:00
stan 569b669a9e Bug 70 - Updated german language files, removed strtolowers and centered sequence images.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2298 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 23:07:02 +00:00
stan eaab76d075 Bug 448 - Fixed some references to old style filter constructs.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2293 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 22:13:16 +00:00
stan 064d7e429e Bug 451 - Strips slashes before escaping if magic quotes on.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2292 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 22:12:00 +00:00
stan 3f953d9b24 Bug 444 - Update Hungarian translation (again)
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2291 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 21:58:00 +00:00
stan f960f55314 Bug 444 - Updated Hungarian translation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2290 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 21:56:22 +00:00
stan abab524930 Bug 449 - Made Ajax request timeouts configurable.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2289 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 21:52:44 +00:00
stan 4802f67587 Bug 440 - Fixed broken PTZ control commands
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2288 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-02 15:27:12 +00:00
stan 9e13cae829 Bug 438 - Fixed various PTZ protocol and control issues.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2281 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-01-08 12:33:11 +00:00
stan 88da842913 Bug 433 - Changed uses of Archive as noun to Archived.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2278 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-31 16:32:46 +00:00
stan a564a904cc Bug 437 - Update Hungarian translation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2277 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-31 16:31:57 +00:00
stan 70284ed18a Bug 435 - Removed duplicated buffer count tokens.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2276 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-31 16:18:55 +00:00
stan 903cde75b5 Uodated for 1.23.1
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2275 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-29 19:07:44 +00:00
stan 97dd987315 Bug 427 - Allow aspect ratio to be preserved in monitor size changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2271 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-29 18:48:16 +00:00
stan 30c1a60294 Updated language files for 1.23.0
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2265 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 17:01:21 +00:00
stan 9b7337045c Fixed problem with Weekdays and filters.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2264 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 16:46:59 +00:00
stan 6d20c94571 Bug 425 - Fixed issue with cycle view when no montage width/height defined.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2262 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 12:54:20 +00:00
stan 66b7d3ec73 Bug 422 - Fixed issue with navigating view when no filter.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2261 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 11:58:04 +00:00
stan 45cb0c2d22 Fixed undefined reference.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2260 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 11:35:49 +00:00
stan 3e4496cad9 Fixed issue with Monitor sequences.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2259 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 11:35:23 +00:00
stan 74a92765a4 Bug 419 - Mods to allow Konqueror to stream.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2255 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-09 16:28:12 +00:00
stan 5aad02876b Bug 418 - Fixed inconsistent Export permissions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2251 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-08 18:42:38 +00:00
stan 877605fe12 Fixed default view being ignored issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2247 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-23 13:02:52 +00:00
stan d51427e567 Commented out some non-error error_log calls.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2246 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-20 17:08:59 +00:00
stan dc8aa90860 Added stream replay mode control.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2245 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-20 17:06:45 +00:00
stan 2457b6ddaa Fixed broken control commands global reference.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2244 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-20 17:06:15 +00:00
stan 48e80ea771 Corrected default label format.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2241 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-18 12:35:15 +00:00
stan c78fec4577 Fixed incorrect Video link.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2240 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-18 12:34:58 +00:00
stan 4f426ba966 Added timeouts to Ajax requests.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2238 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-11 16:00:12 +00:00
stan 9670d8b5f6 Fixed DB typos.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2237 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-11 15:59:59 +00:00
stan 3e65614d4d Added MooTools extension script
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2236 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-11 15:59:29 +00:00
stan 54c577b3e3 Commented out non-error error_log entries
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2235 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-11 15:58:36 +00:00
stan f0e2175340 Fixed sql issue with changing monitor function.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2233 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-07 18:51:43 +00:00
stan 69850ef6bc Revamped Ajax request files and fixed force/disable alarm commands.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2231 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-04 17:33:45 +00:00
stan b75c33afa2 Fixed non-Pelco PTZ control protocols.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2230 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-04 17:31:25 +00:00
stan 1e1ce0f448 Bug 388 - Updated Italian translation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2227 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-24 10:44:44 +00:00
stan 918e20b0e0 Removed version number from mootools include.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2226 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-24 10:39:17 +00:00
stan 4c1d53ca1b Fixed some javascript issues with IE.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2223 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-19 12:34:04 +00:00
stan e282b1695c Updated with new language tokens.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2218 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:33:51 +00:00
stan 160750f81c Initial language edits.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2217 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:22:15 +00:00
stan b7ccd67ea7 Added annotations to DVR buttons.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2215 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:10:56 +00:00
stan 27718cfbbd Allow streamImg to refer to object as well as image.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2214 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:01:53 +00:00
stan 691d80b3fa Made options window slightly taller.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2212 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:01:06 +00:00
stan 0ed68c6574 Bug 389 - Added Hungarian translation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2210 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 11:17:31 +00:00
stan 2f13397a03 Fixed xhtml issues.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2208 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 08:42:33 +00:00
stan 3b4ea51be2 Bug 352 - Controls now disabled for unprivileged users.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2207 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 22:07:50 +00:00
stan 8d205edbbd Fixed typo.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2206 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 21:15:26 +00:00
stan 72166a3bbf Fixed typos in filter queries.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2205 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 20:38:33 +00:00
stan 3427dfddd2 Bug 42 - Users can now change their own passwords.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2204 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 15:49:08 +00:00
stan b7d9da390b Removed some extraneous urlencode functions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2202 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 13:49:21 +00:00
stan 6e871a7335 Bug 33 - Added ability to use jscalendar on date, date/time fields.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2201 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 13:48:40 +00:00
stan 9a885847e1 Bug 404 - Added Hebrew translation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2200 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 12:52:39 +00:00
stan 4d299f0d2e Bug 347 - Fixed incorrect Italian translation of 'Stopped'
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2199 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-07 16:05:54 +00:00
stan b4032959e0 Bug 406 - Added ability to indicate mysql connection port in host.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2198 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-07 15:39:44 +00:00
stan c4607000f2 Bug 407 - Monitor preset javascript php tag fix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2197 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-07 14:03:33 +00:00
stan 315c4656fc Bug 34 - Moved mysql specific functions to more generic functions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2196 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-06 12:59:19 +00:00
stan f93e109b8d Bug 386 - Added system load as filter
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2195 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-06 09:34:44 +00:00
stan 8d905aac99 Bug 400 - Made signal check colour monitor specific.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2193 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-05 15:05:28 +00:00
stan 07a9f1fa1c Bug 228 - Added deep storage option.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2190 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-04 16:08:55 +00:00
stan 2647ba20fe Bug 415 - Merged in enhanced filters
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2189 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-04 14:52:26 +00:00
stan 8c6a77a9f3 Removed warning when x/y %ge not set.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2183 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-30 12:08:51 +00:00
stan bd558af08f Bug 414 - Changed PTZ control functions to use libraries and sockets
rather than scripts.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2180 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-30 10:43:06 +00:00
stan 34cccac893 Bug 34 - Initial database query abstraction
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2177 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-29 22:33:22 +00:00
stan 50cc4d980f Bug 411 - Merged in DVR functionality.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2175 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-29 18:11:09 +00:00
stan e730a3d9cf Bug 384 - Removed WML.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2169 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-29 17:37:23 +00:00
stan e857fea852 Bug 412 - Fixed issue with immediate filters not being executed.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2166 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-29 17:32:36 +00:00
stan 2c09dbeeb9 Bug 410 - Added in detection suspension if motion overloaded.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2132 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-06-05 14:12:14 +00:00
stan f47a391be7 Cosmetic change.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2108 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-04-03 10:33:48 +00:00
stan 53193fcdf4 Bug 379 - Make default view selectable for default monitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2107 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-04-03 10:32:43 +00:00
stan 2ea1dac7fd Bug 397 - Fixed continuous alarm sound in MoCord mode.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2101 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-04-03 10:11:25 +00:00
stan 4ae71ad634 Added Romanian translation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2100 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-04-03 10:05:16 +00:00
stan 2de7b080b1 Fixed incorrectly named tokens, deleted unused one, sorted and removed duplicates.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2094 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-29 15:46:38 +00:00
stan bc9c72fbcd Fixed filter saving.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2092 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-26 12:12:25 +00:00
stan fa83736ba8 Removed duplicate js window sizes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2091 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-26 12:12:03 +00:00
stan 3bed5b69fd Corrected filter save window size.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2090 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-26 12:11:49 +00:00
stan f63d02bfea Added spaces in ShowFilterWindow string.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2089 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-26 12:11:18 +00:00
stan 369353128d Added missing default Devices permission.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2079 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-23 09:40:49 +00:00
stan 2a660566e4 Fixed typo
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2075 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 20:43:27 +00:00
stan c8b03f530c Bug 346 - Stills event view now shows all frames.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2070 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 19:06:31 +00:00
stan fd3eb96298 Updated with 1.22.3 tokens.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2069 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 13:54:06 +00:00
stan 9f425d78e1 Updated filter actions to remove Auto word.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2068 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 13:48:08 +00:00
stan a8e599f742 Removed auto abbreviations.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2067 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 13:36:59 +00:00
stan 612eadd5c8 Updated to show multiline notes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2063 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 11:36:10 +00:00
stan 9672ea2b6d Removed from cvs, no longer required.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2053 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-13 12:45:42 +00:00
stan 76c8189199 Improvements to layout of devices screen.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2052 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-13 12:05:31 +00:00
stan b2d6c657c8 Order monitors by sequence, and space out table.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2051 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-13 12:05:09 +00:00
stan 8a6d8da1ad Bug 381 - Further tidying, mostly to do with device widths.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2048 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-09 11:48:56 +00:00
stan c95952fd41 Bug 360 - No longer necessary to delete cookies to set new format.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2047 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-09 11:48:24 +00:00
stan 8dd3e90d3b Changed default xHTML device size
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2045 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-09 10:56:57 +00:00
stan fa225273bf Fixed incorrect check on download query parm.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2044 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-09 10:56:28 +00:00
stan b82ceaeb80 Added missing semi-colons
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2043 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-09 10:55:58 +00:00
stan ac9a65b400 Bug 381 - Tidied and improved xHTML
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2042 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-09 10:55:41 +00:00
stan c3236c98cf Bug 382 - Added X10 device control to web interface
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2041 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-09 10:54:19 +00:00
stan 8c52662bd2 Bug 382 - Added X10 device control functionality.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2040 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-09 10:51:10 +00:00
stan 8d366321a9 Bug 381 - Tidied and validated xHTML
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2039 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-08 17:53:57 +00:00
stan bd707c81a7 Minor console layout mods.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2038 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-08 10:21:31 +00:00
stan f6e871932f Bug 380 - Added control preset labels
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2037 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-07 12:05:19 +00:00
stan e4846f525c Made sure Control default view doesn't apply if no permissions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2035 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-07 10:16:38 +00:00
stan c6351e6fd3 Bug 379 - Controllable monitors can now have control view as the default.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2033 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-06 13:56:44 +00:00
stan 2d2e41815c Bug 246 - Changed text strings for filter actions to remove 'automatic'
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2032 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-06 13:55:30 +00:00
stan ed0626492f Bug 374 - Multiple monitors can now share the same video device source without penalty.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2030 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-10-24 14:37:34 +00:00
stan 4f424f6eac Bug 360 - Made selection of markup language simpler
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2028 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-10-24 09:44:50 +00:00
stan 471c78c544 Bug 246 - Manually execute filters with actions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2027 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-10-23 15:32:22 +00:00
stan eaf68fad10 Bug 359 - Now allows dashes in host format
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2018 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-10-18 15:27:50 +00:00
stan 2d77044be5 Bug 350 - Fixed user language settings ignored bug.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2017 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-10-18 15:26:40 +00:00
stan 53fdf0adf7 More form outside of table.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2011 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-07-04 10:49:05 +00:00
stan 891575b119 Don't have script section if not required.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2010 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-07-04 10:48:30 +00:00
stan 3a555ebd1c Added misssing default user.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2000 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-30 15:36:16 +00:00
stan cb838481d8 Attempt at solving wrong window going to front on event window.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1990 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-24 13:42:41 +00:00
stan 8b01ebc8a4 Fixed problem with selecting wrong number of frames.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1989 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-24 13:42:14 +00:00
stan 2e6bc75112 Bug 342 - Increased number of available device channels.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1988 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-23 16:11:42 +00:00
stan 69b3dd4a1b Bug 332 - Added event detail to replay window.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1987 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-22 21:36:09 +00:00
stan 9770438c20 Bug 336 - Added basic status view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1985 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-19 13:28:30 +00:00
stan a7a1d213ba Bug 336 - Added basic status view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1984 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-17 12:52:14 +00:00
stan 68e3cbcf02 Bug 316 - Fixed problem with group selection being lost
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1983 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-17 12:51:33 +00:00
stan 44573f3189 Bug 334 - Fixed problem with broken images in stills view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1982 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-10 15:07:29 +00:00
stan 04f5aee7ce Bug 333 - Fixed weekday handling problem in filters.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1981 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-10 13:39:12 +00:00
stan 996fc712cd Moved form outside of table.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1980 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-10 13:38:44 +00:00
stan dc60eb2c5d Added to cvs.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1976 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-08 13:49:20 +00:00
stan 33c66093fb Bug 323 - Allow config files entries to have spaces.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1973 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-08 13:19:50 +00:00
stan 8ccb4ed373 Bug 331 - Fixed so that zones are constrained to legal range when drawing.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1970 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-08 12:56:43 +00:00
stan 00238129f9 Bug 318 - Fixed to include language in config files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1969 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-08 12:55:32 +00:00
stan 1ef6b35bf1 Bug 330 - Fixed problem with zone resizing on monitor resizing.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1968 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-08 12:52:52 +00:00
stan fbaf48ccff Updated for 1.22.1
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1957 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-05 11:17:09 +00:00
stan 1121e7297e Minor tweaks.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1956 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-05 11:11:09 +00:00
stan a47227d887 Bug 324 - Added traditional chinese (big5) language file.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1955 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-05 11:07:36 +00:00
stan 84e809eccd Bug 318 - Changed config for HTML and xHTML to make base file processing clearer.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1954 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-05 10:55:18 +00:00
stan 34a553ca73 Removed extraneous <?=
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1953 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-05 10:53:04 +00:00
stan 13dd29692f Bug 317 - Position cursor on login name field.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1952 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-03 15:10:21 +00:00
stan 9e4e31a702 Bug 314 - Added missing Images token.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1950 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-02 09:59:03 +00:00
stan 534760b3d6 Made form 'get' instead of 'post' to prevent reload message.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1949 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-02 09:58:51 +00:00
stan ab598e3586 Bug 319 - Fixed bogus AlarmMaxFPS column in preset query.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1948 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-02 09:57:40 +00:00
stan 5db0e0b036 Fixed html errors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1940 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-24 11:50:02 +00:00
stan 593909fd58 Made form 'get' again
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1935 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-20 18:13:34 +00:00
stan b1986ed46c Close monitor edit window on saving.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1927 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-12 13:27:44 +00:00
stan c01e48b9b9 Fixed hostname validation to allow for username and passwords.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1926 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-12 13:27:24 +00:00
stan 47e5420a35 Bug 311 - Made local monitor dialog a bit more user friendly.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1921 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-07 11:52:31 +00:00
stan 6753c8fac6 Bug 310 - Fixed problem with editing loaded filters.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1920 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-07 11:51:29 +00:00
stan 5e3e7cc16b Bug 309 - Fixed issue with default zones being set in % and not pixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1919 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-07 11:49:57 +00:00
stan b2e7605c8e Simplified control preset functionality in JavaScript.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1918 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-05 16:29:19 +00:00
stan 9fc68d9cce Bug 288 - Stopped 'stop' button always being present.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1917 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-05 15:36:43 +00:00
stan cd4bb06965 Bug 287 - Added confirmation when deleting events.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1913 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 16:02:27 +00:00
stan b3690b3d58 Encode preset names as HTML entities
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1912 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 15:35:18 +00:00
stan 131ed30d7a Bug 260 - Added average pixel difference to statistics
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1910 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 15:34:16 +00:00
stan 0d4474c6d9 Bug 306 - Correctly parses format default char.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1909 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 14:44:34 +00:00
stan 655999fa82 Bug 303 - Fixed paging issue when deleting last page of events.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1906 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 13:42:31 +00:00
stan 28cde4ed89 Bug 301 - Added monitor specific alarm maximum FPS
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1901 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 12:47:39 +00:00
stan 778c98970a Bug 304 - Fixed stills issue with events with bulk frames.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1900 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 10:11:50 +00:00
stan 6ef579a181 Bug 298 - Now passes filters through when viewing events, plus tidied up.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1897 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-30 11:22:41 +00:00
stan b833a07e31 Bug 291 - Revamped date/time handling to use strftime instead of date and
to use locale aware formats. Also extracted out common formats.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1896 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-27 22:01:33 +00:00
stan 6230ea5f49 Bug 299 - Changed sprintf to use %F where version > 4.3.10
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1895 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-27 20:29:55 +00:00
stan 84751f6356 Updated with 1.22.1 changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1894 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-24 12:42:45 +00:00
stan 38591f6a2c Bug 297 - Initial addition of Swedish language
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1893 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-24 12:14:30 +00:00
stan c8c45756a6 Bug 286 - Fixed to work in IE.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1886 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-23 20:25:48 +00:00
stan b2d49c145f Bug 293 - Fixed xHTML syntax errors, non closed tags
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1881 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-23 18:11:53 +00:00
stan d1dfb17c83 Removed check for spaces etc in Control Capability name.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1880 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-23 18:10:32 +00:00
stan 1acc2abaf7 Added quiet flags to netpbm utils.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1879 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-23 18:10:04 +00:00
stan 2875009c3b Bug 282 - Fixed option category to reinstate lost 'images' options.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1875 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-02-08 12:25:35 +00:00
stan efe1960a53 Bug 279, 280 - Closes window on set preset, saved run states fixed and fixed zones issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1874 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-02-08 12:24:52 +00:00
stan 0f43d26396 Fixed bug in video generation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1873 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-02-08 12:23:47 +00:00
stan 92af058d94 Bug 283 - Converted some forms to use POST.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1869 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-02-07 17:05:54 +00:00
stan 66ab060047 Removed second italian translation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1867 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-24 11:02:09 +00:00
stan 1e1d683785 Merged in language changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1866 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-24 11:01:42 +00:00
stan 58a9e353bd Added in merged changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1865 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-24 10:59:53 +00:00
stan 825b1ee25a Further refinements to groups.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1864 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-24 10:06:34 +00:00
stan ab9e8179c9 Bug 274 - Added validation to monitor dialog
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1863 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-23 23:09:47 +00:00
stan a52e9f4382 Bug 271 - Modified groups page to have more consistent structure, and use monitor selector.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1857 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-23 16:25:01 +00:00
stan ae23010ee2 Tidied up actions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1856 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-23 15:57:07 +00:00
stan 28175b0e52 Bug 269 - Added popup monitor id selector
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1855 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-23 12:14:57 +00:00
stan 4eb5768985 Bug 5 - Added support for linked monitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1854 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-23 12:11:13 +00:00
stan 687ff9b2b5 IE fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1840 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 21:22:05 +00:00
stan 96e4be9bb4 Removed commented out lines about scaling still images.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1839 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 21:19:26 +00:00
stan a8c6e4d49a Fixed miscellaneous warnings and errors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1838 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 21:11:49 +00:00
stan 096072b3dc Bug 230 - Rationalised thumbnails and put them in temporary cache dir.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1836 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 17:07:13 +00:00
stan d732e2ed38 Updated copyright.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1833 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 11:32:47 +00:00
stan 53e5f19026 Disabled video generation if no encoder installed. Updated copyright.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1832 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 11:32:18 +00:00
stan d02adbddc4 Bug 259 - Allowed toggle between analyse and capture images, updated copyright.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1831 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 11:31:31 +00:00
stan 1d3fab2ae3 Removed initial delay in progress bar, updated copyright.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1830 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 11:29:45 +00:00
stan 91f92b3291 Bug 255 - Improved user password handling.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1823 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-15 17:35:53 +00:00
stan b19d36cb49 Bug 252 - Further tweaks to control permissions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1822 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-15 17:33:44 +00:00
stan 1f14862239 Added mysql_free_result calls.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1820 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-15 13:09:30 +00:00
stan 321f8cbf5c Sped up checks for daemon status.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1819 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-15 00:18:51 +00:00
stan 41e64b5d78 Added in extra string.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1816 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 22:50:40 +00:00
stan 9fcf0a31cb Revamped options slightly.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1815 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 22:48:32 +00:00
stan 229dea5bff Bug 219 - FIxed typo in filename.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1808 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 13:44:57 +00:00
stan 0420f3489b Freed some mysql results.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1806 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 13:41:22 +00:00
stan 61cd80c807 Bug 252 - Changed to not require monitor edit permissions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1805 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 13:41:11 +00:00
stan e0aa7c8172 Bug 251 - Fixed problem with 'none' auth relay method.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1804 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 13:39:15 +00:00
stan 994604e1e8 Bug 245 - Made progress behaviour optional.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1803 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 13:38:46 +00:00
stan 0ec21218c2 Bug 219 - Added Czech language to distribution.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1802 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 13:37:59 +00:00
stan cac913b0be Fixed typo in MonitorIds.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1795 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 13:31:51 +00:00
stan 7bf25c99c3 Bug 249 - Added partial event link to timeline and moved timeouts to end of page.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1791 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-12 16:48:32 +00:00
stan 14fc3e2473 Bug 249 - Added event navigator and progress panel
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1790 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-12 15:41:39 +00:00
stan 4f0908a59d Fixed initial zone insert.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1773 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-12 00:00:57 +00:00
stan 0b2c8e66e0 Removed error_reporting call.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1772 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-12 00:00:38 +00:00
stan 2b884505c6 Bug 242 - Made languages a drop down.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1761 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-05 11:11:38 +00:00
stan cde31cf917 Removed redundant tokens.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1755 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-01 19:58:45 +00:00
stan 98662f2e1c Updated with new language tokens.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1754 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-01 19:55:21 +00:00
stan 535ae8f0c8 Bug 215 - Sorted out frames scalign in events (I think).
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1752 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-31 20:12:24 +00:00
stan 10c3718bcc Made donate reminder time dynamically settable.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1751 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-31 19:13:41 +00:00
stan 96b94c1737 Bug 240 - Added monitor presets.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1749 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-31 18:08:07 +00:00
stan b46ab50467 Bug 207 - Rearranged monitor config view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1748 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-31 17:21:45 +00:00
stan d6c37380a6 Updated styles.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1744 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-31 16:10:18 +00:00
stan edab3e5e2e Databased zone presets.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1742 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-27 16:52:28 +00:00
stan 0d1c5ddf1d Bug 238 - Added support for Enabled flag
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1723 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-22 16:49:38 +00:00
stan e8101a231e Bug 238 - Added support for enabled flag.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1722 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-22 16:47:19 +00:00
stan 8029e34bb5 Bug 219 - Added Czech translation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1697 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-20 11:06:41 +00:00
stan d7da9a320c Bug 207 - Modified some layout and video rate options.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1692 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-19 16:52:30 +00:00
stan 601f021e27 Changed references to .z files in distribution to correct one.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1691 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-19 16:51:55 +00:00
stan 4daa855f6f Changed DB_SERVER to DB_HOST
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1686 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-16 12:20:58 +00:00
stan 786488a990 Bug 232 - Removed .z files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1680 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-16 10:27:52 +00:00
stan 01476d308b Bug 232 - Added new '.in' files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1679 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-16 10:16:29 +00:00
stan 6adbd44d77 Bug 207 - Changed default ref blend perc to 7%
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1675 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-16 10:09:11 +00:00
stan c76586472b Added empty around check to avoid php notice.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1674 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-16 10:08:08 +00:00
stan f528a181e7 Bug 224 - Enhanced the view/download video links.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1671 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-09 11:45:08 +00:00
stan bde0b89bac Further refinements to video html.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1668 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-08 22:18:17 +00:00
stan d3b17c1288 Fixed missing > after tr tag
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1667 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-08 22:17:51 +00:00
stan 0b9f6d093d Bug 226 - Separated alarm sound from watch status
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1666 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-08 17:13:00 +00:00
stan d3ca56ab96 Bug 67 - Added auto stop timeout to mapped continuous control.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1665 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-08 17:11:33 +00:00
stan 9aca25f21e Javascript tidy up and removed redundant file.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1662 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-08 11:20:00 +00:00
stan 5924206f43 Bug 223 - Wrapped sound in more compliant tags
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1661 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-08 11:14:15 +00:00
stan 74ac42fb96 Bug 223 - Revamped video presentation, emded & object tags etc, mime-types.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1660 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-08 11:10:44 +00:00
stan 588e308531 Bug 222 - Added zone presets.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1658 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-05 15:11:08 +00:00
stan c52a9c7bb9 Unset points before getting changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1655 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-05 12:19:46 +00:00
stan bfdbc23242 Moved form tages outside of table.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1654 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-05 12:19:26 +00:00
stan e094a25ce5 Bug 207 - Only displayss blob ranges when more than one blob.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1653 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-05 12:19:06 +00:00
stan ab9228a1a7 Refinements to polygonal zones.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1652 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-05 12:18:39 +00:00
stan 0ef4e0f134 Bug 207 - Added zones link.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1650 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-02 10:17:30 +00:00
stan be3dfad079 Now uses defined polygon area and not calculated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1649 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-02 10:17:01 +00:00
stan 6a6ee23288 Enlraged options window slightly.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1645 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-02 10:11:43 +00:00
stan a2083cbabb Further revisions to polygonal zone definition.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1643 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-01 16:35:20 +00:00
stan e4cc77840d CVloses window after zone mod.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1642 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-01 16:35:02 +00:00
stan 6c8d24cd66 Removed custom zmu command path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1641 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-01 16:34:49 +00:00
stan eb23ce10d7 Bug 216 - Zone polygons.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1631 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-29 17:51:31 +00:00
stan 65f7cf09b5 Bug 216 - Zone polygons
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1630 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-29 17:51:06 +00:00
stan 63d3598335 Bug 207 - Minor typos and event directory renaming fix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1629 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-29 16:32:06 +00:00
stan 5edb53e2db Bug 207 - Added annotation to show what auto functions filters have.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1626 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 16:32:40 +00:00
stan 5ab3965945 Now saves execute command as it should.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1625 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 16:32:07 +00:00
stan 51e3885c94 Bug 214 - Separet auto execute flag from command.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1622 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 15:47:38 +00:00
stan b79f7e6c53 Bug 207 - Reformatted XHTML montage view to use tables.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1621 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 15:34:11 +00:00
stan 0e592f6a8f Bug 213 - Correct invalid console behaviour when not running.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1620 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 15:18:57 +00:00
stan 7db02dea5a Bug 207 - Fall back in xHTML to default video format if phone format no specified
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1619 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 15:12:59 +00:00
stan 3d10d019a5 Bug 207 - Don't display zero sized video files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1618 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 15:11:15 +00:00
stan 26694a0478 Bug 212 - Added automatic creation of video to filters.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1617 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 15:08:54 +00:00
stan 5c38d0be38 Bug 211 - Added default rate for event replay.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1616 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 11:21:27 +00:00
stan 01bf61363c Tweaked SQL slightly.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1612 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 10:37:17 +00:00
stan 0fc3d78982 Bug 207 - Fixed sql bug in frame view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1611 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-22 10:35:22 +00:00
stan 4ed464d274 Bug 206 - Changed check all links to master checkbox toggle.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1610 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-21 15:32:04 +00:00
stan 5e58bfa8c4 Bug 210 - Rationalised groups view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1609 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-21 15:30:07 +00:00
stan 212f51d75c Bug 207 - Modified table layout on watch status to prevent wrapping.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1605 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-20 18:51:24 +00:00
stan 6d7d37d709 Bug 204 - Allow filtering on event id.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1604 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-20 18:50:32 +00:00
stan 914afba668 Bug 203 - Added filtering on Notes field.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1601 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-20 12:16:42 +00:00
stan 8a04a85321 Bug 207 - Compacted options table slightly.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1600 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-20 12:16:02 +00:00
stan 2abf694941 Bug 207 - Fixed unassigned x10_monitor array.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1599 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-20 12:15:25 +00:00
stan e1387afb32 Bug 205 - Displays values in fields that are common in multi-edit mode.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1598 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-20 12:12:48 +00:00
stan b4d248bdcb Modified SQL statement slightly.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1592 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-16 10:25:37 +00:00
stan 848630b2a7 Added uninstall hook to complete uninstall.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1590 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-16 10:24:03 +00:00
stan 82365e441d Fixed event edit and added ppage nav to stills view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1587 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-11 12:08:38 +00:00
stan 41a38fefc3 Added flyover help on timeline and fixed empty view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1584 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-10 12:48:51 +00:00
stan a96ccd71f7 Added move_con_map functionality.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1583 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-10 12:04:37 +00:00
stan 062f90acac Fixed bandwidth limiter issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1582 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-10 12:04:14 +00:00
stan bdc7931ee4 Fixed event and frame navigation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1581 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-08 17:57:41 +00:00
stan bfae815a80 Fixed zooming problem on timeline.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1579 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-08 13:27:12 +00:00
stan fa93bbcd37 Added spacer image to Makefile and CVS.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1577 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-07 16:02:01 +00:00
stan a270a38b08 Made control of settings fall on 'Control' permission.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1573 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-07 12:10:49 +00:00
stan a2958d3638 Made optin help a bit taller.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1572 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-07 12:10:25 +00:00
stan 07a31c78f9 Updated language files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1565 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-07 10:04:28 +00:00
stan c26c477420 Bug 191 - Support https protocol.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1564 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 21:21:35 +00:00
stan 8ed3a1d69d Bug 189 - Added direct link to filters from console.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1563 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 21:11:30 +00:00
stan 3e635e1213 Added plus/minus actions to filter.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1562 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 20:19:19 +00:00
stan a325942dd4 Fixed to use correct stylesheet.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1558 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 19:10:24 +00:00
stan b37561f0b0 Fixed to use right stylesheet, correct &amps; and added frame link.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1557 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 19:10:12 +00:00
stan fc86ccd47b Reformatted to use tables.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1556 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 19:09:16 +00:00
stan 278f60e9e0 Fixed to use new format video files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1555 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 19:08:55 +00:00
stan 3316c2191a Fixed to use right stylesheet.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1554 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 19:07:50 +00:00
stan 345da86985 Reformatted with tables.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1553 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 19:06:58 +00:00
stan 241cc7b0cc Fixed default sort of last 10 events.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1552 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 19:06:33 +00:00
stan 8e37d3fde1 Added xhtml video support.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1551 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-06 19:06:03 +00:00
stan edcb21fcfd Added first/last links to event navigation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1550 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-05 16:24:52 +00:00
stan a55cbe32f8 Bug 192 - Fixed xHTML event detail link.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1549 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-05 16:22:33 +00:00
stan 745f0d6e32 Fixed logins.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1548 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-05 16:19:33 +00:00
stan c1fc4fa473 Added speed up code from html and fixed Archived expressions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1547 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-05 16:19:19 +00:00
stan b1f17c365a Further refinements to zooming etc.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1546 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-04 17:16:22 +00:00
stan 107c930732 Fixed broken logins
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1545 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-04 17:04:14 +00:00
stan 90a7a964e8 Added mising operators to expresssions for Archived.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1544 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-04 17:04:01 +00:00
stan 19baf16c24 Enlarged filter window and fields.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1543 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-04 17:03:30 +00:00
stan c408dcf1bf Cde language token global.VS:
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1542 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-04 17:02:59 +00:00
stan 515fa5eda6 Improvements to timeline integration.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1541 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-04 15:39:18 +00:00
stan 351f6c9491 Wrapped text in htmlentities.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1539 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-03 10:48:09 +00:00
stan 1e7704b667 Added missing sql execute.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1538 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-03 10:47:43 +00:00
stan b290319df4 Bug 108 - Added max bandwidth setting to users.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1537 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 17:02:45 +00:00
stan 79bfb8fa9f Modified to use new remote auth methods
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1536 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 16:57:32 +00:00
stan 9c21bc642a Fixed scaling bug
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1535 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 16:16:47 +00:00
stan 1a80c75b6c Fixed authentication errors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1534 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 16:05:09 +00:00
stan 49dc90982c Enlarged options window slightly.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1533 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 16:04:50 +00:00
stan 46585d9cc2 Bug 148 - Allows remote http authentication.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1531 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 15:42:41 +00:00
stan c8586ceba2 Bug 129 - Added additional debug configuration
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1528 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 11:47:03 +00:00
stan 66144008b2 Bug 185 - Fixed login issue on php 4.4
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1527 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 11:46:42 +00:00
stan 3f9c0afa0c Bug 184 - Made default event order configurable.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1525 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-19 17:51:34 +00:00
stan d1e94f3130 Bug 173 - Added default scale per monitor.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1524 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-19 16:52:28 +00:00
stan b49bd14b0f Bug 183 - Allow streaming method to be selectable by bandwidth.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1523 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-19 13:30:05 +00:00
stan ab2d99160e Bug 104 - Monitors can now read images from disk files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1522 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-17 21:55:02 +00:00
stan 74e4bd5737 Bug 73 - Made video devices use paths rather than numbers
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1519 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-17 10:58:25 +00:00
stan 8a66238a2b Bug 170 - Added support for ordering of monitors
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1518 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-17 10:12:53 +00:00