ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
zoneminder/web
History
Emmanuel Papin b294569147 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 
Merging conflicts fixed in files:
	CMakeLists.txt
	configure.ac
	distros/debian_cmake/control
	src/zm_monitor.h
	web/lang/de_de.php
	web/skins/classic/views/monitor.php
 		2015-07-20 16:49:04 +02:00
..
ajax reduce the wait to 2/10ths instead of a whole second 2015-06-05 11:49:05 -04:00
api Merge branch 'master' into multi-server 2015-07-14 16:10:51 -04:00
css clean out autogenerated files 2013-09-12 14:43:57 -04:00
graphics clean out autogenerated files 2013-09-12 14:43:57 -04:00
includes Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-07-20 16:49:04 +02:00
js handle empty [file] to prevent logzilla 2014-11-13 09:17:54 -05:00
lang Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-07-20 16:49:04 +02:00
scripts Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
skins Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-07-20 16:49:04 +02:00
tools rollback mootools-core to 1.4.5-compat 2015-05-09 17:23:01 -05:00
views clean out autogenerated files 2013-09-12 14:43:57 -04:00
CMakeLists.txt fix bootstrap.ini substitution 2015-06-12 11:12:58 -04:00
Makefile.am Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
README.md Update README.md 2013-05-01 08:04:57 -03:00
index.php Fix use of DEFINED. It takes a string not a constant. When COOKIE is not set or has changed, set it 2015-05-11 16:22:14 -04:00

README.md

Modern ZoneMinder Skin

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