History

SteveGilvarry 4245928b35 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage Conflicts: src/CMakeLists.txt src/zm_monitor.cpp web/skins/classic/js/skin.js		2014-10-12 20:10:36 +11:00
..
ajax	fixes WRT to db logging. I believe fixes issue #504	2014-09-26 14:43:58 -04:00
api	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10: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	fixes WRT to db logging. I believe fixes issue #504	2014-09-26 14:43:58 -04:00
js	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
lang	add V4L	2014-07-24 11:37:10 -04: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	2014-10-12 20:10:36 +11:00
tools	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
views	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10: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 wrong install path for core.php and database.php	2014-04-30 12:25:42 +03:00
Makefile.am	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
README.md	Update README.md	2013-05-01 08:04:57 -03:00
index.php	make expiry date relative (~10years)	2014-05-01 09:53:45 +02:00

README.md

Modern ZoneMinder Skin

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