History

SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage Conflicts: src/zm_monitor.cpp src/zm_monitor.h		2016-01-30 15:45:08 +11:00
..
ajax	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-01-30 15:45:08 +11:00
api	sync up to c39 version	2015-12-22 09:44:46 -05:00
css	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
graphics	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
includes	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-01-30 15:45:08 +11:00
js	added missing videojs.zoomrotate.js file	2015-07-28 23:06:03 +10:00
lang	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-01-30 15:45:08 +11:00
scripts	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
skins	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-01-30 15:45:08 +11:00
tools	rollback mootools-core to 1.4.5-compat	2015-05-09 17:23:01 -05:00
views	compat for php 5.4	2015-11-15 21:40:25 +00:00
.editorconfig	More CakePHP cleanup - missed it in `2c04d0774f`	2013-09-05 10:52:55 -04:00
.gitignore	Added my events dir to the gitignore list	2013-09-17 08:54:53 -04:00
.htaccess	More CakePHP cleanup - missed it in `2c04d0774f`	2013-09-05 10:52:55 -04:00
.travis.yml	More CakePHP cleanup - missed it in `2c04d0774f`	2013-09-05 10:52:55 -04:00
CMakeLists.txt	fix bootstrap.ini substitution	2015-06-12 11:12:58 -04:00
Makefile.am	don't add the api to autotools, because the autotools files are not present in there	2015-08-17 12:33:00 -04:00
README.md	Update README.md	2013-05-01 08:04:57 -03:00
index.php	need to include Server class	2015-12-02 10:26:11 -05:00

README.md

Modern ZoneMinder Skin

This web frontend to ZoneMinder is a complete rewrite of the classic frontend, based on CakePHP.