mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-17 05:18:45 -04:00

Files

APHW2 MFGENG 4e080b8a36 Merge branch 'storageareas' into ffmpeg_output

Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
	scripts/ZoneMinder/lib/ZoneMinder/Object.pm

2017-11-07 18:25:33 -08:00

ajax

change quotes, and limit the # of results to 2 when getting next and previous frames. 2 is because one of them could be the currently selected Event,

2017-11-03 15:09:19 -04:00

api

wip nvsocket

2017-10-03 13:28:56 -07:00

css

Merge branch 'log_no_truncate' into storageareas

2017-06-14 10:18:27 -04:00

fonts

Show error message upon unsuccessful login. Fixes #1648

2016-11-10 22:51:32 -07:00

graphics

Swap to PNG

2017-03-18 22:34:13 +11:00

includes

Merge branch 'storageareas' into ffmpeg_output

2017-11-07 18:25:33 -08:00

Feature h264 videostorage (#1882 )

2017-05-15 22:02:48 -04:00

lang

add Edit Layout

2017-10-30 16:29:46 -04:00

scripts

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

skins/classic

add the options for nvsocket as an include

2017-11-06 07:31:08 -08:00

tools/mootools

Removed Autotools Makefile.am

2016-02-26 22:19:02 +11:00

views

Update DiskSpace when we create jpg's

2017-10-23 17:04:02 -07:00

.editorconfig

Feature h264 videostorage (#1882 )

2017-05-15 22:02:48 -04:00

.gitignore

Feature h264 videostorage (#1882 )

2017-05-15 22:02:48 -04:00

.htaccess

Feature h264 videostorage (#1882 )

2017-05-15 22:02:48 -04:00

.travis.yml

Feature h264 videostorage (#1882 )

2017-05-15 22:02:48 -04:00

CMakeLists.txt

Feature h264 videostorage (#1882 )

2017-05-15 22:02:48 -04:00

index.php

Fix saving MontageLayouts

2017-10-30 20:21:16 -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.