zoneminder/web/skins/classic/views
Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO
Conflicts:
	zm.conf.in
2013-11-08 11:22:09 -05:00
..
css Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07:00
js Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07: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 make sortorder be asc or desc, not something arbitrary which needs to be escaped 2013-11-01 12:30:07 -04:00
control.php more quoting removal 2013-10-17 16:15:04 -04:00
controlcap.php more quoting removal 2013-10-17 16:15:04 -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 quoting removal 2013-10-17 16:15:04 -04:00
cycle.php more quoting removal 2013-10-17 16:15:04 -04:00
device.php more quoting removal 2013-10-17 16:15:04 -04: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 Merge branch 'master' into mysql2PDO 2013-10-17 17:02:44 -04:00
eventdetail.php more quoting removal 2013-10-17 16:15:04 -04: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 quoting removal 2013-10-17 16:15:04 -04:00
frames.php more quoting removal 2013-10-17 16:15:04 -04:00
function.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04: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 more quoting removal 2013-10-17 16:15:04 -04:00
monitorpreset.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
monitorprobe.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
montage.php use parameter passing instead of explicit exscaping 2013-11-03 15:40:00 -05: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 quoting removal 2013-10-17 16:15:04 -04: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 quoting removal 2013-10-17 16:15:04 -04:00
status.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
timeline.php make sortorder be asc or desc, not something arbitrary which needs to be escaped 2013-11-01 12:30:07 -04:00
user.php more quoting removal 2013-10-17 16:15:04 -04:00
version.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
video.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
watch.php more quoting removal 2013-10-17 16:15:04 -04:00
zone.php remove extra quoets since dbEcape does quoting now 2013-10-17 15:35:23 -04:00
zones.php Fix a missing NULL second paramter to dbFetchAll 2013-11-03 16:06:31 -05:00