zoneminder/web
SteveGilvarry 20c295ad0c Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
	.travis.yml
	CMakeLists.txt
	Makefile.am
	bootstrap.sh
	configure.ac
	distros/debian8/control
	distros/debian_cmake/control
	misc/Makefile.am
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	src/CMakeLists.txt
	src/Makefile.am
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zmstreamer.cpp
	web/lang/ru_ru.php
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
2016-04-07 00:00:38 +10:00
..
ajax Removed Autotools Makefile.am 2016-02-26 22:19:02 +11:00
api address issue #1335 2016-03-12 08:07:25 -05:00
css Removed Autotools Makefile.am 2016-02-26 22:19:02 +11:00
graphics Removed Autotools Makefile.am 2016-02-26 22:19:02 +11:00
includes Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
js Removed Autotools Makefile.am 2016-02-26 22:19:02 +11:00
lang Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
scripts Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
skins/classic Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
tools/mootools Removed Autotools Makefile.am 2016-02-26 22:19:02 +11:00
views Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
CMakeLists.txt fix bootstrap.ini substitution 2015-06-12 11:12:58 -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.