zoneminder/web/skins/classic/views
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
..
css Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07:00
js Temporary workaround to show all ptz control types regardless of monitor source type. 2014-02-13 08:43:19 -06:00
Makefile.am Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
bandwidth.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
blank.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
console.php Merge branch 'mysql2PDO' 2014-03-20 16:48:03 -04:00
control.php more updates 2013-12-17 12:53:15 -05:00
controlcap.php Merge branch 'mysql2PDO' 2014-03-20 16:48:03 -04:00
controlcaps.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
controlpreset.php more updates 2013-12-17 12:53:15 -05:00
cycle.php add ServerHost filter 2013-11-13 10:13:09 -05:00
device.php more updates 2013-12-17 12:53:15 -05:00
devices.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
donate.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
error.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
event.php more updates 2013-12-17 12:53:15 -05:00
eventdetail.php more updates 2013-12-17 12:53:15 -05:00
events.php more quoting removal, some slight optimisations 2013-10-17 21:03:24 -04:00
export.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
filter.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
filtersave.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
frame.php more updates 2013-12-17 12:53:15 -05:00
frames.php more updates 2013-12-17 12:53:15 -05:00
function.php Update function.php 2013-08-16 13:41:33 +02:00
group.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
groups.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
log.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
login.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
logout.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
monitor.php Merge branch 'mysql2PDO' 2014-03-20 16:48:03 -04:00
monitorpreset.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
monitorprobe.php Detection Support for WansView Cams 2013-12-11 11:29:30 +01:00
montage.php Merge branch 'mysql2PDO' 2014-03-20 16:48:03 -04:00
none.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
optionhelp.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
options.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
plugin.php more updates 2013-12-17 12:53:15 -05:00
postlogin.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
settings.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
state.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
stats.php more updates 2013-12-17 12:53:15 -05:00
status.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
timeline.php Merge branch 'mysql2PDO' 2014-03-20 16:48:03 -04:00
user.php more updates 2013-12-17 12:53:15 -05:00
version.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
video.php more updates 2013-12-17 12:53:15 -05:00
watch.php more updates 2013-12-17 12:53:15 -05:00
zone.php more updates 2013-12-17 12:53:15 -05:00
zones.php Fix a missing NULL second paramter to dbFetchAll 2013-11-03 16:06:31 -05:00