Commit Graph

19 Commits

Author SHA1 Message Date
Andrew Bauer 9f43825b92 prevent the end user from slecting an invalid configuration on the PT… (#1676)
* prevent the end user from slecting an invalid configuration on the PTZ control configuraion "Move" tab

* change to console.php should not be in this pr
2016-11-08 22:10:51 -05:00
Andrew Bauer 3a94712db2 add translate function 2015-05-10 08:10:30 -05:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11: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
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02:00
Edward Barnard 3201e5a431 Adds web ui support for libvlc camera. 2013-12-19 21:51:39 +00:00
Isaac Connor 3393a63525 more updates 2013-12-17 12:53:15 -05:00
Isaac Connor 2a45506bff more quoting removal 2013-10-17 16:15:04 -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
Kyle Johnson 2c04d0774f Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
Kyle Johnson 1ed6462354 Removed all of the old web files 2013-05-01 06:52:43 -04: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 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 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 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 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 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