Kyle Johnson
|
b86c3f1e43
|
Zones are deleted when their parent Monitor is
|
2014-04-25 02:33:02 +00:00 |
|
Kyle Johnson
|
7ced617db2
|
Frames are deleted when their parent Event is
|
2014-04-25 02:24:46 +00:00 |
|
Kyle Johnson
|
0bae740a6c
|
Initial index, view, edit and delete functions for Frames
|
2014-04-25 02:15:15 +00:00 |
|
Kyle Johnson
|
814359a003
|
Added a route for frames
|
2014-04-25 02:14:53 +00:00 |
|
Kyle Johnson
|
c836b81a21
|
Initial commit of Frame Model
|
2014-04-25 02:11:05 +00:00 |
|
Kyle Johnson
|
5cabbe280d
|
Initial xml and json views for Event index and view
|
2014-04-25 02:01:17 +00:00 |
|
Kyle Johnson
|
5385e20e8e
|
Initial index, view, edit and delete functions for Events
|
2014-04-25 02:00:50 +00:00 |
|
Kyle Johnson
|
710bb966b8
|
Added a route for events
|
2014-04-25 01:59:57 +00:00 |
|
Kyle Johnson
|
159a1ec533
|
Initial xml and json views for Config index and view
|
2014-04-23 20:01:08 +00:00 |
|
Kyle Johnson
|
af91a1482f
|
Initial index, view, edit and delete functions for Configs
|
2014-04-23 19:59:52 +00:00 |
|
Kyle Johnson
|
b2ad265054
|
Added a route for configs
|
2014-04-23 19:58:52 +00:00 |
|
Kyle Johnson
|
ed8bc57d4c
|
Added a route for zones
|
2014-04-23 19:54:15 +00:00 |
|
Kyle Johnson
|
bb7cd7652a
|
Initial xml and json views for Zone index and view
|
2014-04-23 19:54:00 +00:00 |
|
Kyle Johnson
|
30657dbf93
|
Initial index, view, edit, update and delete functions for Zones
|
2014-04-23 19:53:43 +00:00 |
|
Kyle Johnson
|
485f1b6da8
|
Initial xml and json views for Monitor view
|
2014-04-23 03:56:40 +00:00 |
|
Kyle Johnson
|
f97568870c
|
Initial xml and json views for Monitor index
|
2014-04-23 03:45:23 +00:00 |
|
Kyle Johnson
|
2ee9ffde60
|
Initial index, view, edit, update and delete functions for Monitors
|
2014-04-23 03:44:56 +00:00 |
|
Kyle Johnson
|
8e88fbe87c
|
Added routes for monitors xml / json
|
2014-04-23 03:43:59 +00:00 |
|
Kyle Johnson
|
53c8f05812
|
Added htaccess file to allow rewriting
|
2014-04-23 03:25:24 +00:00 |
|
Kyle Johnson
|
92e2212d9c
|
Initial commit of Zone Model
|
2014-04-23 03:14:25 +00:00 |
|
Kyle Johnson
|
51eced48b1
|
Initial commit of Event Model
|
2014-04-23 03:14:15 +00:00 |
|
Kyle Johnson
|
8a70747088
|
Initial commit of Config Model
|
2014-04-23 03:14:08 +00:00 |
|
Kyle Johnson
|
5e56a5a7cb
|
Initial commit of Monitor Model
|
2014-04-23 03:13:56 +00:00 |
|
Kyle Johnson
|
2c94183721
|
Initial commit of CakePHP 2.5.0-RC1 for the API
|
2014-04-23 02:51:50 +00:00 |
Kfir Itzhak
|
3cee6a133d
|
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
|
2014-04-22 20:13:11 +03:00 |
|
Kfir Itzhak
|
0dbcc836b4
|
Merge pull request #325 from elenril/master
Support building with new libavcodec versions.
|
2014-04-19 00:08:39 +03:00 |
|
Kfir Itzhak
|
2f542b2396
|
Merge pull request #395 from hamiltont/patch-6
Remove SVN install from Travis CI
|
2014-04-18 23:23:14 +03:00 |
Hamilton Turner
|
b196965c4c
|
Remove SVN install from Travis CI
|
2014-04-18 13:26:25 -04:00 |
Kyle Johnson
|
fd4f77b145
|
Merge pull request #381 from m-bene/flatLayout2
Fix window sizes and input field sizes for flat skin
|
2014-04-18 09:40:00 -04:00 |
|
Kyle Johnson
|
4b7f1896b9
|
Merge pull request #385 from maciekczwa/master
fix sql error which prevents remote login from working
|
2014-04-18 09:39:09 -04:00 |
|
Kyle Johnson
|
83b2b0c619
|
Merge pull request #380 from m-bene/switchLayout
Fix reload loop on switching skins
|
2014-04-18 09:38:17 -04:00 |
|
Kyle Johnson
|
cf3283b1a1
|
Merge pull request #393 from hamiltont/patch-4
Remove Subversion from prerequesite lists
|
2014-04-18 09:36:54 -04:00 |
|
Kyle Johnson
|
cda3f981e6
|
Merge pull request #390 from hamiltont/patch-1
Remove apt-get upgrade from Dockerfile
|
2014-04-18 09:30:07 -04:00 |
|
Hamilton Turner
|
e5d2f6af7a
|
Remove Subversion from prerequesite lists
|
2014-04-18 02:53:16 -04:00 |
|
Hamilton Turner
|
7b62780292
|
Remove apt-get upgrade
Convention is to avoid this if not needed, as there is no init
system and some packages have to be held back. upgrade will
sometimes break due to the state of ubuntu:latest
To see the official issue: dotcloud/docker#1724
To see workarounds: https://github.com/racker/docker-ubuntu-with-updates/blob/master/precise/Dockerfile
|
2014-04-17 23:05:23 -04:00 |
Maciej Czerniak
|
50a9055601
|
fix sql error which prevents remote login from working
|
2014-04-13 09:54:11 +02:00 |
m-bene
|
b56093a637
|
Fix window sizes and input field sizes for flat skin
|
2014-04-11 09:53:46 +02:00 |
|
m-bene
|
f737af15b9
|
Fix reload loop on switching skins
|
2014-04-11 09:40:23 +02:00 |
Sune1337
|
a8a0bf922f
|
Move initializer for last_motion_score to avoid compiler warning "...zones will be initialized after ... last_motion_score ... when initialized here"
|
2014-04-10 15:53:28 +02:00 |
|
Sune1337
|
6c637947e2
|
Ability to skip frames in motion detection.
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
|
2014-04-10 14:59:34 +02:00 |
|
Kyle Johnson
|
db5a8fe194
|
Merge pull request #375 from m-bene/flatLayout
Fix small / cropped DRV controls in event view. Fixes #356
|
2014-04-09 16:45:15 -04:00 |
|
m-bene
|
bd5e25644e
|
same dvr controlls in event as in monitor
|
2014-04-09 20:19:23 +02:00 |
Isaac Connor
|
afc7581146
|
use zmDbConnect instead of all the DBI connect stuff
|
2014-04-09 10:34:58 -04:00 |
Andrew Bauer
|
35468af815
|
Merge pull request #338 from m-bene/extendPreclusive
add feature to extend preclusive zone alarm state by x frames
|
2014-04-08 08:04:37 -05:00 |
|
Andrew Bauer
|
8bd7f131bf
|
Merge pull request #367 from PX03AFK/patch-3
Update zoneminder.tmpfiles
|
2014-04-08 07:48:38 -05:00 |
|
Andrew Bauer
|
8fb83e867c
|
Merge pull request #374 from m-bene/parseFilters
do not quote column names in parse filter
|
2014-04-08 07:40:25 -05:00 |
|
m-bene
|
f22b956b8b
|
do not quote column names in parse filter
|
2014-04-08 09:07:59 +02:00 |
|
Andrew Bauer
|
221f9afa6c
|
Merge pull request #373 from m-bene/filterTermsUndefined
Fix 'Undefined index: filter' php warnings for filter view when
|
2014-04-07 15:24:54 -05:00 |
|
m-bene
|
9a714f8d6d
|
Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments
|
2014-04-07 16:11:48 +02:00 |
David Wilcox
|
5cd165e9d5
|
Update zoneminder.tmpfiles
Incorrect directory
|
2014-04-03 22:16:38 -04:00 |