Isaac Connor f726666f54 Merge branch 'master' into h265

2019-01-14 12:36:11 -05:00

..

add_monitors.php

make find and find_one functions consistent across Objects

2018-09-07 16:31:11 -04:00

alarm.php

google code style

2018-06-25 14:51:46 -04:00

console.php

merge from sa the ajax file to apply the sorting.

2017-05-25 14:08:04 -04:00

control.php

Use Monitor class instead of old sql

2015-12-09 09:23:42 -05:00

event.php

Alter code style, spacing

2018-07-12 14:05:23 -04:00

log.php

fix log export. minTime and maxTime were being cleared by the regexp to detect sub second time. Also use ZM_DIR_EXPORTS instead of ZM_PATH_SWAP

2018-11-12 15:43:03 -05:00

status.php

!= E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than !=

2018-09-30 10:15:04 -04:00

stream.php

create ZM_PATH_SOCKS if it doesn't exist

2018-08-11 13:35:57 -04:00

zone.php

remove ZM_DIR_IMAGES (#2374)

2018-12-29 09:52:58 -05:00