Isaac Connor
|
186e5ba866
|
Merge branch 'master' into storageareas
|
2017-02-21 09:48:00 -05:00 |
Matthew Noorenberghe
|
df4739826b
|
Reduce the default API debug level
|
2017-02-18 23:06:53 -08:00 |
Isaac Connor
|
d9a31f7fb6
|
Merge branch 'master' into storageareas
|
2016-10-26 13:39:31 -04:00 |
Pliable Pixels
|
92d7cad5f1
|
enabled utf8
|
2016-09-21 11:53:34 -04:00 |
|
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 |
|
Isaac Connor
|
532fb77ecb
|
As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes
|
2016-04-30 08:09:56 -04:00 |
Andy Bauer
|
827eebd38c
|
remove core.php, modify core.php.default
|
2015-08-29 14:53:39 -05: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
|
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 |