Isaac Connor 24ceb75936 Merge branch 'master' into include_fs_config_in_api_config		2018-06-21 21:41:54 -04:00
..
Component	disable FilterComponent as it doesn't actually do anything. Add Groups join when needed	2017-12-09 14:03:42 -05:00
AppController.php	don't need to define the config, it will have already been done. Include auth.php instead of functions.php as the code has been moved	2018-04-06 14:42:10 -04:00
ConfigsController.php	Munge the config in the global configvals into the configs array before returning it.	2018-05-10 13:44:46 -04:00
ControlsController.php	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
EventsController.php	add fileSize to the api, and use it to add remote fileSize reporting in includes/Event	2018-05-08 13:33:56 -07:00
FramesController.php	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00
GroupsController.php	Merge ../ZoneMinder.master into storageareas	2018-03-06 12:29:59 -05:00
HostController.php	naming consistency of attribute (#2096)	2018-05-03 14:03:49 -04:00
LogsController.php	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
MonitorsController.php	Fix controlling daemon when the monitor is Local	2018-06-06 12:56:33 -04:00
PagesController.php	further merges from cakephp 2.10.8	2018-03-21 13:09:55 -04:00
ServersController.php	change permissions to stream permissions for view	2016-05-02 19:48:24 -04:00
StatesController.php	address issue #1335	2016-03-12 08:07:25 -05:00
ZonePresetsController.php	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
ZonesController.php	retab	2016-09-03 15:02:32 -04:00