Isaac Connor 0142c71c85 Merge branch 'master' into fix_2772		2019-12-20 11:02:27 -05:00
..
Config	In production mode, debug should be 0	2019-09-04 08:47:09 -04:00
Console	further merges from cakephp 2.10.8	2018-03-21 13:09:55 -04:00
Controller	Merge branch 'master' into fix_2772	2019-12-20 11:02:27 -05:00
Model	fix #2771. Correct relationship from hasMany to hasAndBelongsToMany for Monitors in Group Modelel. Use save Assiociated in Controller, and add code to handle backwards compatibility by turning MonitorIds into the appropriate Monitor array	2019-12-15 15:31:40 -05:00
Plugin	fixup half-merged changes to filter to view in montagereview	2019-04-08 16:57:41 -04:00
View	add templates for daemonControl to api	2018-11-14 12:54:40 -05:00
vendor	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
webroot	Migrate Webcache out of webroot (#2083)	2018-04-19 15:01:46 -04:00
index.php	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00