6 Commits

Author	SHA1	Message	Date
Isaac Connor	d52a6f9a95	Merge branch 'improve_filter' into storageareas	2016-05-27 09:57:05 -04:00
Joshua Ruehlig	e12160456b	Support user defined MySQL Port/Socket in API	2016-05-09 00:24:08 -07:00
Isaac Connor	4aafd1d417	Make api use zm.conf	2016-04-30 13:50:09 -04:00
Isaac Connor	ce69f24bdd	use zm.conf values for database connection	2016-04-30 08:11:39 -04:00
Kfir Itzhak	afd4e451fd	Add the web/api folder to cmake	2014-04-30 12:16:46 +03:00
Kyle Johnson	f1f3de6d7d	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00