SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: configure.ac src/Makefile.am web/js/Makefile.am		2016-04-05 22:06:14 +10:00
..
Monitor.php	implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220	2016-01-04 13:15:50 -05:00
Server.php	return empty for the non multi-server case	2016-01-04 13:46:05 -05:00
actions.php	Remove Phone BW settings used with mobile skin	2016-02-26 22:43:37 +11:00
config.php.in	change multi-server error message text	2016-03-01 11:12:54 -06: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	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-04-05 22:06:14 +10: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