13 Commits

Author	SHA1	Message	Date
Isaac Connor	e4b0e74f69	merge master	2015-09-24 10:01:27 -04:00
Isaac Connor	ba1100fc03	continue conversion from array to class of Monitor	2015-09-17 16:06:47 -04:00
Isaac Connor	c48bd3ebca	restore	2015-08-27 11:37:33 -04:00
Isaac Connor	75919c9cd5	Merge branch 'master' into multi-server ... Conflicts: docs/installationguide/ubuntu.rst misc/apache.conf.in src/zm_monitor.cpp	2015-08-27 10:34:47 -04:00
Isaac Connor	22275e661c	Tell cake to use the same session id as classic ui	2015-08-21 09:03:44 -04:00
Isaac Connor	41637278c9	merge master	2015-08-19 16:08:12 -04:00
Isaac Connor	880e77b096	Merge branch 'master' into multi-server ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h	2015-08-19 13:30:48 -04:00
Isaac Connor	51631b84b4	cleanup generated files	2015-07-09 10:59:45 -04:00
pliablepixels	12ba217de0	Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master	2015-06-13 16:32:37 +00:00
Isaac Connor	bda35ed4d6	fix bootstrap.ini substitution	2015-06-12 11:12:58 -04:00
Ubuntu	dd9603f70f	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00: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