Isaac Connor 48c9c2b6c0 Merge branch 'add_monitor_status_to_api' into storageareas		2018-10-31 14:47:52 -04:00
..
Config	brackets and spaces	2018-04-06 14:52:56 -04:00
Console	further merges from cakephp 2.10.8	2018-03-21 13:09:55 -04:00
Controller	Merge branch 'warn_colour_when_disabled' into storageareas	2018-10-30 12:05:47 -04:00
Model	rough in adding Monitor_Status to Monitors	2018-10-31 11:08:44 -04:00
Plugin	Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas	2018-10-28 15:09:32 -04:00
View	Merge branch 'storageareas' into api_auth	2018-07-10 12:46:30 -04: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