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

Files

Isaac Connor 67b365948e Merge branch 'storageareas' into zma_to_thread

Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
	web/includes/Monitor.php
	web/skins/classic/views/js/add_monitors.js
	web/skins/classic/views/js/console.js

2018-01-29 15:53:26 -05:00

ajax

Merge branch 'storageareas' into zma_to_thread

2018-01-29 15:53:26 -05:00

api

Rename column Id OF Monitor_Statuses to simplify JOINS.

2018-01-26 13:39:37 -05: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 zma_to_thread

2018-01-29 15:53:26 -05:00

fix some memleaks

2017-11-28 09:50:09 -05:00

lang

fix typos

2017-12-18 13:16:54 -05:00

scripts

update gpl 2 mailing address in source files

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

skins/classic

Merge branch 'storageareas' into zma_to_thread

2018-01-29 15:53:26 -05:00

tools/mootools

upgrade mootools to 1.6.0

2017-11-22 11:46:02 -05:00

views

Whitespace and use ZM_DIR_EXPORT instead of ZM_DIR_TMP

2018-01-24 22:21:43 +01: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

add a robots.txt to the docroot to tell bots to not scrape our ZM install.

2017-12-07 09:32:23 -05:00

index.php

Merge branch 'storageareas' into zma_to_thread

2018-01-29 15:53:26 -05:00

README.md

Update README.md

2013-05-01 08:04:57 -03:00

robots.txt

add a robots.txt to the docroot to tell bots to not scrape our ZM install.

2017-12-07 09:32:23 -05:00

README.md

Modern ZoneMinder Skin

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