Merge pull request #2402 from MPOS/development

UPDATE : Development to Master

Author: TheSerapher

CHANGELOG.md

@@ -1,3 +1,36 @@
+1.0.2 (Apr 28th 2015)
+---------------------
+
+* Allow SSO accross MPOS pools
+  * Added a new config options
+    * `$config['db']['shared']['acounts']`, defaults to `$config['db']['name']`
+    * `$config['db']['shared']['workers']`, defaults to `$config['db']['name']`
+    * `$config['db']['shared']['news']`, defaults to `$config['db']['name']`
+  * Will access `accounts`, `pool_workers` and `news` on shared table
+  * Does not allow splitting `accounts` and `pool_woker` across database hosts
+  * Required `$config['cookie']['domain']` to be set
+    * You need to use the top domain shared between hosts as the setting
+    * e.g. `ltc.thepool.com` and `btc.thepool.com` it has to be `.thepool.com` (NOTE the leading .)
+* Increased information on `Admin -> Wallet Info`
+  * Added block count to Wallet Status
+  * Added number of accounts to Wallet Status
+  * Added Peer information
+  * Added last 25 transactions
+    * Can be changed via Admin System Settings -> Wallet
+  * Always show all accounts
+* Updated Auto Payout Threshold to be stored in `coin_address` table
+  * Existing thresholds will be migrated when upgrading
+  * Update to `1.0.1` for the database using the upgrade script supplied in MPOS
+* Updated Bootstrap to 3.3.4
+* Updated MorrisJS to 0.5.1
+* Updated RaphaelJS to 2.1.2
+* Updated Bootstrap Switch to 3.3.2
+* Updated CLEditor to 1.4.5
+* Removed unneeded JS files
+* Removed unneeded CSS files
+* Fixed ding for block notifications not playing on Safari
+* Fixed manual payout warning to show when account balance is too low
+
 1.0.1 (Apr 15th 2015)
 ---------------------
 

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/MPOS/php-mpos.png?branch=master)](https://travis-ci.org/MPOS/php-mpos) [![Code Coverage](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=master) master<br />
+[![Build Status](https://travis-ci.org/MPOS/php-mpos.png?branch=master)](https://travis-ci.org/MPOS/php-mpos) [![Code Climate](https://codeclimate.com/github/MPOS/php-mpos/badges/gpa.svg)](https://codeclimate.com/github/MPOS/php-mpos) [![Code Coverage](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=master) master<br />
 [![Build Status](https://travis-ci.org/MPOS/php-mpos.png?branch=development)](https://travis-ci.org/MPOS/php-mpos) [![Code Coverage](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/coverage.png?b=development)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=development) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/quality-score.png?b=development)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=development)  development
 
 

cronjobs/blockupdate.php

@@ -80,4 +80,3 @@
 }
 
 require_once('cron_end.inc.php');
-?>

cronjobs/cron_end.inc.php

@@ -22,4 +22,3 @@
 $monitoring->endCronjob($cron_name, 'OK', 0, false, false);
 $monitoring->setStatus($cron_name . "_runtime", "time", microtime(true) - $cron_start[$cron_name]);
 $monitoring->setStatus($cron_name . "_endtime", "date", time());
-?>

cronjobs/findblock.php

@@ -178,4 +178,3 @@
 }
 
 require_once('cron_end.inc.php');
-?>

cronjobs/notifications.php

@@ -75,4 +75,3 @@
 }
 
 require_once('cron_end.inc.php');
-?>

cronjobs/pplns_payout.php

@@ -289,4 +289,3 @@
 }
 
 require_once('cron_end.inc.php');
-?>

cronjobs/pps_payout.php

@@ -200,4 +200,3 @@
 $log->logInfo("Completed PPS Payout");
 
 require_once('cron_end.inc.php');
-?>

cronjobs/proportional_payout.php

@@ -169,4 +169,3 @@
 }
 
 require_once('cron_end.inc.php');
-?>

cronjobs/shared.inc.php

@@ -87,5 +87,3 @@ function cfip() { return (@defined('SECURITY')) ? 1 : 0; }
   $log->logFatal('Cronjob is currently disabled due to required upgrades. Import any outstanding SQL files and check your configuration file.');
   $monitoring->endCronjob($cron_name, 'E0075', 0, true, false);
 }
-
-?>