Merge branch 'release-3.1.0' into develop

CHANGELOG.rst

@@ -1,8 +1,8 @@
 Changelog
 =========
 
-not yet released
-----------------
+v3.1.0 (released August 7, 2014)
+--------------------------------
 
 Features:
 
@@ -35,7 +35,7 @@ Bugs:
 * Composer added for dependencies.
 
 v3.0.1 (released April 12, 2014)
-----------------
+--------------------------------
 
 * #56: Minimum PHP version is PHP 5.3.7 (not PHP 5.3.0).
 * #58: Server order on users page now matches the order on servers page.

README.rst

@@ -1,7 +1,7 @@
 PHP Server Monitor
 ==================
 
-Version 3.1.0-dev
+Version 3.1.0
 
 PHP Server Monitor is a script that checks whether your websites and servers are up and running.
 It comes with a web based user interface where you can manage your services and websites,

docs/conf.py

@@ -51,7 +51,7 @@ copyright = u'2008-2014, Pepijn Over'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.0-dev'
+version = '3.1.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 

src/includes/psmconfig.inc.php

@@ -29,7 +29,7 @@
 /**
  * Current PSM version
  */
-define('PSM_VERSION', '3.1.0-dev');
+define('PSM_VERSION', '3.1.0');
 
 /**
  * URL to check for updates. Will not be checked if turned off on config page.

src/psm/Util/Install/Installer.class.php

@@ -401,7 +401,7 @@ class Installer {
 		$queries = array();
 		psm_update_conf('log_retention_period', '365');
 
-		psm_update_conf('pushover_status', 1);
+		psm_update_conf('pushover_status', 0);
 		psm_update_conf('log_pushover', 1);
 		psm_update_conf('pushover_api_token', '');
 		$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` ADD  `pushover_key` VARCHAR( 255 ) NOT NULL AFTER `mobile`;";