mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-11 18:37:28 -04:00

Files

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

ajax

Add label size to monitor options (frontend part)

2015-08-10 15:35:19 +02:00

api

Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp

2015-08-18 14:07:38 -05: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 pull request #962 from Linwood-F/959-add-exif-date-time-to-images

2015-08-18 13:46:54 -05:00

handle empty [file] to prevent logzilla

2014-11-13 09:17:54 -05:00

lang

Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval

2015-08-18 20:20:53 -05:00

scripts

Reverting my web changes in develop - keeping them in modern

2013-05-02 10:20:06 -04:00

skins

Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval

2015-08-18 20:20:53 -05:00

tools

rollback mootools-core to 1.4.5-compat

2015-05-09 17:23:01 -05:00

views

Fix bug report on 100% scale 2

2015-08-09 20:30:42 -04:00

CMakeLists.txt

fix bootstrap.ini substitution

2015-06-12 11:12:58 -04: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

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

README.md

Modern ZoneMinder Skin

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