Commit Graph

6 Commits

Author SHA1 Message Date
Nls 6be807cf9a
Add header_name & header_value to the server object 2018-03-27 23:36:01 +02:00
Pepijn Over 32e018b6bb
preparing for 3.2.0 release 2018-03-27 23:24:25 +02:00
Victor Macko dc132831d4 Merge branch 'develop' of github.com:phpservermon/phpservermon
Conflicts:
	src/includes/functions.inc.php
	src/lang/en_US.lang.php
	src/psm/Module/Config/Controller/ConfigController.class.php
	src/psm/Util/Server/Updater/StatusUpdater.php
	src/templates/config/config.tpl.html
2016-07-06 22:43:10 +10:00
Samuel Denis-D'Ortun c811876c89 Merge branch '201410_log-users' of https://github.com/davyrolink/phpservermon into davyrolink-201410_log-users
# Conflicts:
#	src/includes/psmconfig.inc.php
#	src/psm/Util/Install/Installer.php
2016-05-21 20:33:31 -04:00
Mauro Vietri 0d3934108c Improved Spanish translation & add utf8 decoding before sending email notifications to correctly display special characters on subject and body 2015-04-21 08:07:30 -03:00
Pepijn Over 1123603f64 [refactoring] PSR-4 support through composer, mass-renaming all *.class.php to *.php to adhere to PSR-4 2015-02-27 15:18:37 +01:00