Isaac Connor 19d46c2d09 Merge branch 'master' into storageareas

2016-08-15 10:45:50 -04:00

..

actions.php

fix spacing and code style, and when logging in, change view to console

2016-07-22 16:03:39 -04:00

config.php.in

quit the stream in zones.php when zone.php is called

2016-04-10 15:33:55 -05:00

control_functions.php

convert monitor hash accesses to function calls

2015-12-01 15:16:43 -05:00

database.php

Add back changes

2016-05-22 08:08:12 -07:00

Event.php

Merge branch 'master' into storageareas

2016-08-15 10:45:50 -04:00

Frame.php

add ability to pass show=capture or show=analyse to getImageSrc

2016-08-12 15:14:51 -04:00

functions.php

always put popup links in a, even if it is disabled

2016-07-22 16:03:57 -04:00

lang.php

add translate function

2015-05-10 08:10:30 -05:00

logger.php

remove unneccessary quoting and escaping

2013-12-06 15:51:36 -05:00

Monitor.php

fix error messages when an empty Monitor is instantiated

2016-08-09 10:43:51 -04:00

Server.php

Merge object model classes from storageareas

2016-05-05 15:33:28 -04:00

Storage.php

Merge object model classes from storageareas

2016-05-05 15:33:28 -04:00