Isaac Connor eccfced6d4 Merge branch 'multi-server' into newpointone ...

Conflicts:
	distros/ubuntu1204/apache.conf

2015-12-22 09:54:13 -05:00

..

actions.php

missed dbServer -> dbStorage

2015-12-15 11:21:52 -05:00

config.php.in

check for value of ZM_SERVER_NAME and ZM_SERVER_HOST and include it in the error message

2015-09-16 11:12:04 -04:00

control_functions.php

convert monitor hash accesses to function calls

2015-12-01 15:16:43 -05:00

database.php

Have PDO actually throw exceptions on db errors. Prior to this it would have been just failing silently. Also, fix a . to -> in the exception catcher.

2015-11-11 16:56:28 -05:00

functions.php

only do CORS if Origin is set

2015-12-02 11:02:47 -05:00

lang.php

add translate function

2015-05-10 08:10:30 -05:00

logger.php

remove unneccessary quoting and escaping

2013-12-06 15:51:36 -05:00

Makefile.am

include Storage.php

2015-12-18 12:13:26 -05:00

Monitor.php

Slight update to allow the instantiation with no row or Id

2015-12-22 09:52:33 -05:00

Server.php

Handle case where parameter is not passed to constuctor

2015-12-15 11:19:50 -05:00

Storage.php

add default parameter in constuctor

2015-12-15 13:27:57 -05:00