Commit Graph

1088 Commits

Author SHA1 Message Date
Sebastian Grewe
eacb8dff03 updated templates 2013-08-22 11:30:27 +02:00
Sebastian Grewe
ae1a5c8ed3 Use baseline shares for share class 2013-08-22 11:30:13 +02:00
Sebastian Grewe
b23dd56bc8 Adding baseline shares to statistics class
* Calculate shares towards our base diff
* Calculate share rate based on actual shares not diff
2013-08-22 11:29:26 +02:00
Sebastian Grewe
d28e728d6c minor cleanup 2013-08-22 11:28:18 +02:00
Sebastian Grewe
36d64b27fd adding share rate to prop sidebar 2013-08-22 11:28:01 +02:00
Sebastian Grewe
2aad605cf2 minor cleanup 2013-08-22 11:27:09 +02:00
Sebastian Grewe
56cfa24eb4 Include worker diff in API
Addresses #145
2013-08-20 17:03:41 +02:00
Sebastian Grewe
96066993ac adding per-worker difficulty display 2013-08-20 16:50:40 +02:00
Sebastian Grewe
7769550f89 fixing missing network hashrate in this branch 2013-08-20 15:58:17 +02:00
Sebastian Grewe
526701d2e1 Merging with origin/next to get branch updated 2013-08-20 15:55:05 +02:00
Sebastian Grewe
4abe462e01 Merge pull request #618 from TheSerapher/issue-617
Fix: Display proper PPS value
2013-08-19 01:41:44 -07:00
Sebastian Grewe
2db6dba482 Fix: Display proper PPS value
* Fixes: Wrong PPS value before the first block is found

Fixes #617
2013-08-19 10:40:25 +02:00
Sebastian Grewe
c057efce3e Merge pull request #616 from TheSerapher/issue-605
Issue 605
2013-08-19 01:00:12 -07:00
Sebastian Grewe
59bd71c75d Fixing admin requests
Fixes #605
2013-08-19 09:59:41 +02:00
Sebastian Grewe
2e4a94ff8c Merge pull request #615 from TheSerapher/issue-612
Removing IRC reference
2013-08-19 00:40:10 -07:00
Sebastian Grewe
f8f50fdc05 Removing IRC reference
Fixes #612
2013-08-19 09:39:45 +02:00
Sebastian Grewe
d6422ea5a8 Merge pull request #602 from TheSerapher/issue-582
Adding QRCodes under Accounts
2013-08-19 00:38:37 -07:00
Sebastian Grewe
c7cc4d429f Merge pull request #609 from TheSerapher/issue-608
Adding gethourlyhashrates API call
2013-08-19 00:38:28 -07:00
Sebastian Grewe
408ebf3b0b Merge branch 'next' into issue-569
Conflicts:
	cronjobs/findblock.php
2013-08-19 09:37:54 +02:00
Sebastian Grewe
f0921264f8 Fixing proof-of-stake detection
Fixes #569
2013-08-19 09:36:25 +02:00
Sebastian Grewe
b5b40620f0 Merge pull request #614 from TheSerapher/issue-611
Remove number_format for transaction generation
2013-08-18 23:49:34 -07:00
Sebastian Grewe
e7b8cb8d4a Remove number_format for transaction generation
* Fixes: Incorrect payouts due to number formatting
* Moved number_format to output only

Fixes #611
2013-08-19 08:48:27 +02:00
Sebastian Grewe
a56907ba00 Adding gethourlyhashrates API call
Fixes #608
2013-08-15 10:08:48 +02:00
Sebastian Grewe
405451d67a Merge pull request #607 from TheSerapher/issue-606
Issue 606
2013-08-15 01:06:22 -07:00
Sebastian Grewe
1708e5d2b5 Do not add 24th hour, use 0 hour 2013-08-15 10:03:22 +02:00
Sebastian Grewe
14c0535b10 Fill empty hours with proper data
* Properly sort the array prior to sending it back
 * Sort from current to one hour earlier for proper data display
 * Adjusted templates to use new sorted arrays

Fixes #606
2013-08-15 09:58:33 +02:00
Sebastian Grewe
50f380c25e first test to fill with data 2013-08-15 09:14:02 +02:00
Sebastian Grewe
16557465e4 Added: getuserbalance API call
* Adds getbalance to API
* Admins: Can fetch any users balance
* Users: Can fetch only their own balance

Fixes #605
2013-08-15 08:58:50 +02:00
Sebastian Grewe
85b2f04434 Merge pull request #601 from TheSerapher/issue-600
Fixing notification reset for active workers
2013-08-14 03:11:08 -07:00
Sebastian Grewe
020d1ef01b Fixing notification reset for active workers
Fixes #600
2013-08-14 11:48:41 +02:00
Sebastian Grewe
ad6ceed77e fixing worker activity on mobile template 2013-08-14 11:47:46 +02:00
Sebastian Grewe
fcf5a21ce3 Adding QRCodes under Accounts
* Added: API String QR Code for #582 and #591

This will allow more QRCodes being added that are specific to an
account. The require library is added and the API string can be used as
an example how codes are generated.

Fixes #582
2013-08-14 11:44:29 +02:00
Sebastian Grewe
e057f1224e Merge pull request #599 from TheSerapher/issue-598
Fixing combined hashrate graph
2013-08-14 02:23:49 -07:00
Sebastian Grewe
e5cb4d0886 Fixing combined hashrate graph
This shouuld fix #598 with graphs being completely off
2013-08-14 11:23:14 +02:00
Sebastian Grewe
a10b5099ce Update POOLS.md
Added @nutnut pools
2013-08-14 11:21:21 +02:00
Sebastian Grewe
184ad5d58b fixing color of total percentage again 2013-08-14 11:15:49 +02:00
Sebastian Grewe
351138f38a Merge pull request #597 from TheSerapher/issue-596
Issue 596
2013-08-14 02:12:47 -07:00
Sebastian Grewe
567b8e1655 Fix rounding issues on total row
* Use actual percentages to calculate the total to ensure
  the rows average matches the totals average

Fixes #596
2013-08-14 11:10:58 +02:00
Sebastian Grewe
0679601fbd Initilize totals with 0 values
Addresses #596
2013-08-14 11:03:56 +02:00
Sebastian Grewe
0833bc3a3e Merge branch 'next' of github.com:TheSerapher/php-mmcfe-ng into next 2013-08-14 11:00:06 +02:00
Sebastian Grewe
c0e8459519 fix coloring of total percentage 2013-08-14 10:59:50 +02:00
Sebastian Grewe
7b53f4fc6b Merge pull request #595 from TheSerapher/issue-588
Fixing PPLNS payouts when exceeding target
2013-08-13 21:48:19 -07:00
Sebastian Grewe
0b701d7d06 Merge pull request #593 from TheSerapher/issue-585
Fixing round estimates on public stats page
2013-08-13 00:21:12 -07:00
Sebastian Grewe
22e7904da7 Fixing round estimates on public stats page
* Fix: Display round restimates when making pool stats public via ACL
* Fix: Display proper pool efficiency when pool stats are public

Fixes #585
2013-08-13 09:20:06 +02:00
Sebastian Grewe
64e2c4ed77 Merge pull request #590 from nicoschtein/manual-payout-fee-fix
Sustract fee to manual_payout cron too.
2013-08-12 21:37:20 -07:00
Nicolas Schteinschraber
80d2cda399 Sustract fee to manual_payout cron too. 2013-08-12 22:55:40 -03:00
Sebastian Grewe
85e22bc02f Adding totals to block statistics
* Total expected shares
* Total actual shares
* Average Percentage
2013-08-12 10:07:19 +02:00
Sebastian Grewe
f3a0cf0417 Fixing PPLNS payouts when exceeding target
Round shares are taken to only match PPLNS target. Round target was not
re-adjusted to reflect the new, lower amount of round shares.

* Fix: Properly adjust round target shares when exceeding PPLNS target

Fixes #588 once merged
2013-08-12 09:35:45 +02:00
Sebastian Grewe
68f2d72cac use regexp detection 2013-08-12 08:48:30 +02:00
Sebastian Grewe
581888fe1f Update POOLS.md 2013-08-12 08:45:25 +02:00