8 Commits

Author	SHA1	Message	Date
Isaac Connor	c095b9cd33	Merge branch 'master' into fix_2167	2018-07-24 16:48:29 -04:00
Isaac Connor	dc57a3c91c	fix spacing/quotes/google code style	2018-07-24 16:41:09 -04:00
Isaac Connor	08d3f98e5e	use for auth, and add Monitor Edit checks to Zone add/delete/edit	2018-07-24 11:49:40 -04:00
Pliable Pixels	1440dd9265	retab	2016-09-03 15:02:32 -04:00
Pliable Pixels	7bf0b3c423	readded forMonitor - removed by mistake	2016-09-03 14:51:24 -04:00
Pliable Pixels	9a4330eb59	#1537 Zones Controller not returning all zones	2016-09-03 14:46:47 -04:00
Ubuntu	dd9603f70f	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
Kyle Johnson	f1f3de6d7d	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00