Commit Graph

1670 Commits

Author SHA1 Message Date
jrd288 10dba9b4c2 Offer login instead of error
When a user accesses a view but receives an error, and is not logged
on, he is offered a login prompt instead.  The login prompt saves the
original query URL in a hidden field, and postlogin redirects back to
the original URL once the user has logged on.

If the user is logged in and there is an error, no login prompt is
shown.

This allows the user to click an event link in an e-mail and then log
in before being shown the event, instead of requiring going back
through the front ZM page to log in.
2014-12-15 17:17:03 -05:00
Emmanuel Papin 82ef0edac3 Restore conflictuous modifications for plugin support 2014-12-13 20:02:58 +01:00
Emmanuel Papin d961831355 Fix conflict when merging upstream master 2014-12-13 19:54:54 +01:00
Isaac Connor 3c8153c9b4 better fix for the view=console security flaw.
This does it in index.php,so it guards all pages, and also just changes the view to login, so instead of giving an error, it presents you with the login, which I think is better.
2014-12-12 09:38:54 -05:00
Isaac Connor b1aa349f11 add check to see if user has rights to view this monitor 2014-12-12 09:32:03 -05:00
Isaac Connor 74da3e9c02 fix auth requirement by checking for user when AUTH is on 2014-12-11 17:09:18 -05:00
Isaac Connor fafef86298 Merge branch 'control_improvements' 2014-12-08 16:52:52 -05:00
Isaac Connor 27b9001eb4 default MoveRoot to empty to quiet an error in logs 2014-12-08 16:52:10 -05:00
Isaac Connor 5abc58ea14 Merge pull request #620 from SteveGilvarry/11-php-short-tags
Replace PHP Short Open Tags - Fixes #11

Works for me too.
2014-12-08 14:39:24 -05:00
Isaac Connor 2c1e4a9965 fix the paths so that the ptzControls are visible 2014-12-08 10:34:25 -05:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
Isaac Connor f57f903aa6 Add views subdir 2014-12-01 16:10:01 -05:00
Isaac Connor af0d9a1065 bug fix for listing the css options.
use SELECTED="SELECTED" instead of just SELECTED
2014-12-01 15:58:00 -05:00
Isaac Connor fed12291be add flat to the subdirs 2014-12-01 15:57:44 -05:00
Isaac Connor 9f7d31949d remove the flat subdir 2014-12-01 15:55:22 -05:00
Isaac Connor 82c01479c6 move flat css files into the classic skin.
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
2014-12-01 15:44:01 -05:00
Isaac Connor d7e08559d6 Merge pull request #582 from hanzese/patch-1
Update et_ee.php
2014-12-01 15:34:53 -05:00
Emmanuel Papin a4c01435d7 Fix confict when pulling master 2014-11-29 03:37:06 +01:00
Hannes e60919f19a Update et_ee.php
Translating some code comments.
2014-11-27 03:51:40 +02:00
Hannes 92b65c553e Update et_ee.php
Changing back charset-utf-8.
2014-11-27 03:43:59 +02:00
Isaac Connor ebe602616b needs this one too 2014-11-26 14:30:53 -05:00
Isaac Connor 593f0781d6 this css directory was moved under /web/skins/classic/css/views so we don't need to have it in the SUBDIRS 2014-11-26 11:57:35 -05:00
Isaac Connor 641c94d5be add CSSDescription which is used on the options tab for skin 2014-11-26 11:57:01 -05:00
Isaac Connor 193cb71b71 Add option for setting css to use with the skin. Also happens to add missing elements of the table for the skins tab and cleans up some spacing. Also, use a variable to tell whether to reload the page or not, which is required after you change the skin or css. 2014-11-26 11:55:53 -05:00
Isaac Connor a412799003 Move the skins/classic/views/css dir under skins/classic/css/classic/views and update Makefile.am's to match 2014-11-26 11:29:04 -05:00
Isaac Connor 5bf34de07b Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use. 2014-11-26 11:26:29 -05:00
Isaac Connor bf3ec7b490 Since the css files are in subdirectories now, thise just needs to reference them 2014-11-26 11:24:55 -05:00
Isaac Connor ebb31f12d2 Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use. 2014-11-26 11:23:06 -05:00
Isaac Connor 53b70d27fb Use the global variable which gets setup in web/index.php to look in a subdirectory of web/skins/classic/css to find the css files. 2014-11-26 11:18:03 -05:00
Isaac Connor 4c864aec35 fix saving groups 2014-11-25 14:29:15 -05:00
Emmanuel Papin dde1e13f22 Merge branch 'master' into plugin_support 2014-11-21 14:02:12 +01:00
Emmanuel Papin 4e9c3494b8 Convert french lang file to UTF-8 2014-11-20 20:51:49 +01:00
hanzese 993a186d06 Update et_ee.php
ZoneMinder Estonian Translation by Hannes
2014-11-19 10:25:35 +02:00
hanzese db86ac7b40 Update et_ee.php
ZoneMinder Estonian Translation by Hannes
2014-11-17 18:06:37 +02:00
hanzese 79ca3dd736 Update et_ee.php
ZoneMinder Estonian Translation
2014-11-17 02:53:50 +02:00
Kyle Johnson 35530c627a Initial commit of Logs MVC 2014-11-15 19:03:40 +00:00
Kyle Johnson 0129ca5f74 Rework the ConfigParser component. 2014-11-15 19:03:10 +00:00
Kyle Johnson e7d726bf75 Don't print out the Config string to the file system. 2014-11-15 19:02:54 +00:00
Kyle Johnson fcaa67e3c3 Slight refactor of ConfigParser Component. Needs more work. 2014-11-15 19:02:18 +00:00
Kyle Johnson cf3d0f962c Add view for Configs Edit 2014-11-15 19:02:03 +00:00
Kyle Johnson 9f80a7d5f5 Show a list of Config Key:Value pairs 2014-11-15 19:01:32 +00:00
Kyle Johnson 9268c503af Do not display the "hidden" config category 2014-11-15 19:01:19 +00:00
Kyle Johnson b9f54056da Add component for dumping Config table as HTML 2014-11-15 18:59:58 +00:00
Kyle Johnson de631075d3 Return possible source types ni DB via API 2014-11-15 18:59:24 +00:00
Kyle Johnson 0d57306790 Find category configs only when $category is not null. API 2014-11-15 18:58:58 +00:00
Kyle Johnson 9f150c4e46 Revert "Find category configs only when $category is not null. API"
This reverts commit efbbcadc7dad9aa52a7aab0483546eab48840ae6.
2014-11-15 18:58:51 +00:00
Kyle Johnson b88febeaee Find category configs only when $category is not null. API 2014-11-15 18:58:43 +00:00
Kyle Johnson 0a7ba112ab API support for querying config categories.
Either return a list of distinct categories, or all configs under a
certain category
2014-11-15 18:55:20 +00:00
manupap1 dac1756d0d Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2014-11-14 10:55:05 +01:00
Isaac Connor 9c30b806f2 don't require SystemView to view/select groups.
Change the way the groups ine is displayed to give people some idea that it might have something to do with grouping
use _POST instead of _REQUEST
2014-11-13 10:38:20 -05:00
Isaac Connor ebe35c2135 handle empty [file] to prevent logzilla 2014-11-13 09:17:54 -05:00
manupap1 cee8b77bec Add plugin translations in language files 2014-11-12 10:20:18 +01:00
manupap1 eae1357a45 Support plugins in web user interface 2014-11-12 00:53:53 +01:00
Andrew Bauer 26c9a77590 Update skin.js
Fix issue caused by a previous merge
2014-11-10 12:12:54 -06:00
Isaac Connor 2f32c3895b Merge branch 'release-1.28'
Conflicts:
	web/skins/flat/js/skin.js
2014-10-22 15:10:19 -04:00
Isaac Connor c5a1d9ffa9 fix console refresh in this skin too 2014-10-22 10:58:06 -04:00
Andrew Bauer 23ebbf3887 Update skin.js
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-21 17:22:33 -05:00
Isaac Connor 8d225566b1 Move this line down to mitigate the problem where the console doesn't refresh. 2014-10-20 15:32:30 -04:00
Andrew Bauer 7ea003441d Merge pull request #371 from m-bene/resizeWindows
Reduce window size to exclude task bar area
2014-10-09 14:46:46 -05:00
Isaac Connor bec58a6011 fixes WRT to db logging. I believe fixes issue #504 2014-09-26 14:43:58 -04:00
Andrew Bauer aa3803cb0b Update functions.php
A more efficient check for IE >= 11 than the previous commit
2014-09-13 09:47:22 -05:00
Andrew Bauer 91b99b97a5 Update functions.php
Add logic to detect the User Agent string from IE11 (and potentially newer).
2014-09-13 08:19:08 -05:00
Jan M. Hochstein f1b2ba091c Update meta makefiles 2014-09-12 16:06:19 +02:00
Isaac Connor 2018228daf fix V inputs 2014-08-21 11:58:51 -04:00
Isaac Connor 6564c4359b adjust monitor popup height 2014-08-21 11:15:35 -04:00
Isaac Connor 707f2e84db increase monitor popup height to fit v4l settings in 2014-08-21 11:14:48 -04:00
Isaac Connor f93a28f2be fixup multibuffering so it can have a null value which makes it fall back to config table 2014-08-21 11:13:38 -04:00
Jan M. Hochstein 5f1fda43a0 Basic support for SOAP 1.1 and 1.2 2014-08-17 21:24:27 +02:00
Jan M. Hochstein 99e794a97b Removed hard coded binary path and perl binary location 2014-08-07 18:25:07 +02:00
Isaac Connor 0834e1b61d I see no reason for these to be posts. They retrieve info, that's it. 2014-07-29 16:15:31 -04:00
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