Isaac Connor
|
2c02a479d6
|
remove duplicated config code from bootstrap and just include config.php
|
2018-04-06 14:38:32 -04:00 |
|
Isaac Connor
|
87f5204c46
|
rename process_configfile to remove namesspace colision
|
2018-04-05 11:44:21 -04:00 |
|
Isaac Connor
|
fb392b2765
|
put back process_configfile
|
2018-04-05 11:33:24 -04:00 |
|
Isaac Connor
|
8fee795fb4
|
don't duplicate declaration of process_configfile, because we include our version from ZM
|
2018-04-05 11:24:17 -04:00 |
|
Isaac Connor
|
a4fee5c91c
|
further merges from cakephp 2.10.8
|
2018-03-21 13:09:55 -04:00 |
|
Isaac Connor
|
1b1b93f811
|
use CakePHP-Enum-Behavior to add support for ENUMs to the Monitor model. This should fix #48
|
2018-01-01 14:43:02 -05:00 |
|
Isaac Connor
|
1cd69c69b9
|
add defining ZM_SERVER_ID after loading config
|
2018-01-01 13:10:39 -05:00 |
|
Isaac Connor
|
cfbfc0dd44
|
Merge branch 'master' into storageareas
|
2017-07-21 11:04:32 -04:00 |
|
Isaac Connor
|
efb02f3368
|
fix indent
|
2017-07-21 10:54:48 -04:00 |
Andrew Bauer
|
5cf2be528a
|
Merge pull request #1950 from connortechnology/fix_api_logs
fix path to logs for api
|
2017-07-14 13:19:12 -05:00 |
|
Isaac Connor
|
240a990c7f
|
fix writing to config
|
2017-07-14 12:19:43 -04:00 |
|
Isaac Connor
|
e203064bf7
|
updates bootstrap.php.in to match config.php's conf.d loading
|
2017-07-14 12:03:00 -04:00 |
|
Isaac Connor
|
13a72b7a99
|
fix path to logs for api
|
2017-07-14 11:58:15 -04:00 |
|
Isaac Connor
|
9824049c0c
|
fix conf.d loading in api
|
2017-07-14 11:46:36 -04:00 |
|
Isaac Connor
|
84fd80b242
|
undo cake log path changes
|
2017-06-08 12:21:51 -04:00 |
|
Isaac Connor
|
c7b52bd998
|
fix logging dirs
|
2017-05-30 13:14:43 -04:00 |
Isaac Connor
|
ab4b5e6b69
|
Merge pull request #1853 from knnniggett/cakecache
change cake cache engine from File -> Apc
|
2017-04-14 21:10:23 -04:00 |
Andrew Bauer
|
48a73f7e78
|
change cache engine from File -> Apc
|
2017-04-14 14:31:42 -05:00 |
|
Andrew Bauer
|
3cbd32cd41
|
move cake log to zoneminder log folder
|
2017-04-14 14:24:29 -05: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 |
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 |