Isaac Connor 26bba58c56 Merge branch 'master' into feature-h264-videostorage

2016-06-17 11:09:47 -04:00

..

alarm.php

improve error message. The unrecognized action error happens above, so this error should just mention permissions

2016-05-16 14:38:40 -04:00

control.php

Use Monitor class instead of old sql

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

event.php

close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session.

2015-04-20 13:06:34 -04:00

log.php

Adjust download file path to swap path to match the file generated.

2016-06-14 20:49:38 +10:00

status.php

better way of detecting showing image or video in timeline and event view

2015-10-24 22:22:52 -07:00

stream.php

reduce the wait to 2/10ths instead of a whole second

2015-06-05 11:49:05 -04:00

zone.php

change quotes to prevent php7 complaint

2016-04-09 11:25:56 -04:00