Andrew Bauer fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval ... Conflicts: CMakeLists.txt configure.ac db/zm_update-1.28.101.sql src/zm_monitor.cpp src/zm_monitor.h version		2015-08-18 20:20:53 -05:00
..
js	Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval	2015-08-18 20:20:53 -05:00
Makefile.am	include server.php in autotools build	2015-08-16 12:25:23 -04:00
bandwidth.php	…
blank.php	…
console.php	replace php short open tag	2015-08-16 12:29:03 -05:00
control.php	…
controlcap.php	…
controlcaps.php	…
controlpreset.php	…
cycle.php	…
device.php	…
devices.php	…
donate.php	…
error.php	…
event.php	…
eventdetail.php	…
events.php	…
export.php	…
filter.php	…
filtersave.php	…
frame.php	…
frames.php	use correct tag for the frame popup so that it gets the correct popup window size	2015-06-03 12:09:38 -04:00
function.php	followup changes based on comments in #833	2015-05-21 12:23:31 -05:00
group.php	change edit permission from system to groups	2015-08-15 13:45:43 -05:00
groups.php	bump version to 1.28.101	2015-08-15 12:01:57 -05:00
log.php	…
login.php	…
logout.php	…
monitor.php	Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval	2015-08-18 20:20:53 -05:00
monitorpreset.php	…
monitorprobe.php	…
montage.php	…
none.php	…
onvifprobe.php	…
optionhelp.php	…
options.php	add Groups to options again	2015-08-15 12:37:25 -05:00
plugin.php	…
postlogin.php	…
server.php	content for server edit popup	2015-08-17 12:42:20 -04:00
settings.php	…
state.php	…
stats.php	…
status.php	…
timeline.php	followup changes based on comments in #833	2015-05-21 12:23:31 -05:00
user.php	bump version to 1.28.101	2015-08-15 12:01:57 -05:00
version.php	…
video.php	…
watch.php	…
zone.php	…
zones.php	…