Skip to content

Commit 50af836

Browse files
TheSerapherTheSerapher
committed
Merge pull request #2402 from MPOS/development
UPDATE : Development to Master
2 parents 308ddc8 + dfa34bc commit 50af836

File tree

211 files changed

+4504
-17326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+4504
-17326
lines changed

‎CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
1.0.2 (Apr 28th 2015)
2+
---------------------
3+
4+
* Allow SSO accross MPOS pools
5+
* Added a new config options
6+
* `$config['db']['shared']['acounts']`, defaults to `$config['db']['name']`
7+
* `$config['db']['shared']['workers']`, defaults to `$config['db']['name']`
8+
* `$config['db']['shared']['news']`, defaults to `$config['db']['name']`
9+
* Will access `accounts`, `pool_workers` and `news` on shared table
10+
* Does not allow splitting `accounts` and `pool_woker` across database hosts
11+
* Required `$config['cookie']['domain']` to be set
12+
* You need to use the top domain shared between hosts as the setting
13+
* e.g. `ltc.thepool.com` and `btc.thepool.com` it has to be `.thepool.com` (NOTE the leading .)
14+
* Increased information on `Admin -> Wallet Info`
15+
* Added block count to Wallet Status
16+
* Added number of accounts to Wallet Status
17+
* Added Peer information
18+
* Added last 25 transactions
19+
* Can be changed via Admin System Settings -> Wallet
20+
* Always show all accounts
21+
* Updated Auto Payout Threshold to be stored in `coin_address` table
22+
* Existing thresholds will be migrated when upgrading
23+
* Update to `1.0.1` for the database using the upgrade script supplied in MPOS
24+
* Updated Bootstrap to 3.3.4
25+
* Updated MorrisJS to 0.5.1
26+
* Updated RaphaelJS to 2.1.2
27+
* Updated Bootstrap Switch to 3.3.2
28+
* Updated CLEditor to 1.4.5
29+
* Removed unneeded JS files
30+
* Removed unneeded CSS files
31+
* Fixed ding for block notifications not playing on Safari
32+
* Fixed manual payout warning to show when account balance is too low
33+
134
1.0.1 (Apr 15th 2015)
235
---------------------
336

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![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 />
1+
[![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 />
22
[![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
33

44

‎cronjobs/blockupdate.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,3 @@
8080
}
8181

8282
require_once('cron_end.inc.php');
83-
?>

‎cronjobs/cron_end.inc.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@
2222
$monitoring->endCronjob($cron_name, 'OK', 0, false, false);
2323
$monitoring->setStatus($cron_name . "_runtime", "time", microtime(true) - $cron_start[$cron_name]);
2424
$monitoring->setStatus($cron_name . "_endtime", "date", time());
25-
?>

‎cronjobs/findblock.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,4 +178,3 @@
178178
}
179179

180180
require_once('cron_end.inc.php');
181-
?>

‎cronjobs/notifications.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,3 @@
7575
}
7676

7777
require_once('cron_end.inc.php');
78-
?>

‎cronjobs/pplns_payout.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,3 @@
289289
}
290290

291291
require_once('cron_end.inc.php');
292-
?>

‎cronjobs/pps_payout.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,3 @@
200200
$log->logInfo("Completed PPS Payout");
201201

202202
require_once('cron_end.inc.php');
203-
?>

‎cronjobs/proportional_payout.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,3 @@
169169
}
170170

171171
require_once('cron_end.inc.php');
172-
?>

‎cronjobs/shared.inc.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,3 @@ function cfip() { return (@defined('SECURITY')) ? 1 : 0; }
8787
$log->logFatal('Cronjob is currently disabled due to required upgrades. Import any outstanding SQL files and check your configuration file.');
8888
$monitoring->endCronjob($cron_name, 'E0075', 0, true, false);
8989
}
90-
91-
?>

0 commit comments

Comments
 (0)