zoneminder/web/skins/classic/views
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
..
css Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07:00
js Merge remote-tracking branch 'Sune1337/motion/FrameSkip' 2014-04-22 20:13:11 +03: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 fix extra } 2014-03-24 13:44:06 -04:00
control.php more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
controlcap.php Merge branch 'mysql2PDO' 2014-03-20 16:48:03 -04:00
controlcaps.php more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
controlpreset.php more updates 2013-12-17 12:53:15 -05:00
cycle.php more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
device.php more updates 2013-12-17 12:53:15 -05:00
devices.php more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -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 copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
eventdetail.php more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
events.php more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
export.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
filter.php Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments 2014-04-07 16:11:48 +02:00
filtersave.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
frame.php more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
frames.php more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04: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 remote-tracking branch 'Sune1337/motion/FrameSkip' 2014-04-22 20:13:11 +03: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 Fix reload loop on switching skins 2014-04-11 09:40:23 +02: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 Merge pull request #338 from m-bene/extendPreclusive 2014-04-08 08:04:37 -05:00
zones.php Fix a missing NULL second paramter to dbFetchAll 2013-11-03 16:06:31 -05:00