Sebastian Grewe
c9a8f8dc65
adjusting pplns target to baseline shares
2013-08-22 14:39:46 +02:00
Sebastian Grewe
eb435b4072
fixing difficulty per worker value
2013-08-22 12:33:29 +02:00
Sebastian Grewe
6522fb2747
fixing merge conflicts
2013-08-22 11:54:17 +02:00
Sebastian Grewe
1f6ccfd6be
Merge pull request #628 from TheSerapher/issue-610
...
Issue 610
2013-08-22 02:47:46 -07:00
Sebastian Grewe
1c24820735
Adding network_confirmations to configuration
...
* Added new configuration option `$config['network_confirmations']` to
dist config
* Default to 120 if not set
This will allow us to define a different confirmation level for user
transactions but still display blocks at their approriate unconfirmed
value when displaying them in the wallet information for admins. Risky
for pool owners but still a viable option.
Fixes #610
2013-08-22 11:45:40 +02:00
Sebastian Grewe
10a794cd4f
Merge pull request #626 from TheSerapher/issue-622
...
Issue 622
2013-08-22 02:36:12 -07:00
Sebastian Grewe
6ec5b4b845
Fixing hashrate graphs
...
* Proper initilize array in order
* Fill data after initilizing
* Removed 0 fills
Thanks @iriiria for this fix!
Fixes #624
2013-08-22 11:33:26 +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
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
ba95d678a0
moved motd to website tab
2013-08-20 12:08:59 +02:00
Sebastian Grewe
7ec8fa9b95
Moving a lot of settings from config to adminpanel
...
* Migrated configuration options to admin panel
* Removed configuration options from config file
* Added help text for each configuration option into panel
Addresses #622 and needs extensive testing by pools. A lot has changed
so pool owners might have to adjust their own templates to match this
new system.
2013-08-20 12:02:47 +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
d6422ea5a8
Merge pull request #602 from TheSerapher/issue-582
...
Adding QRCodes under Accounts
2013-08-19 00:38:37 -07:00
Sebastian Grewe
7e4c5dab4e
Adding unconfirmed blocks to wallet
...
First attempt addressing #610 , still missing a detection for the actual
confirmation limit required for each block in case one lowers it in the
config.
2013-08-19 09:31:53 +02:00
Sebastian Grewe
a56907ba00
Adding gethourlyhashrates API call
...
Fixes #608
2013-08-15 10:08:48 +02: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
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
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
031b4940cd
admin should see all transactions in summary
2013-08-08 12:05:06 +02:00
Sebastian Grewe
1a459a7913
Adding transaction summary by types
...
Addresses #581
2013-08-08 12:02:39 +02:00
Sebastian Grewe
03da52117a
Fix user seeing other users transactions
...
Fixes #577
2013-08-08 09:36:05 +02:00
Sebastian Grewe
6767b5a235
Merge pull request #576 from TheSerapher/issue-561
...
Issue 561
2013-08-07 21:46:44 -07:00
Sebastian Grewe
c9139034a4
Merge pull request #573 from TheSerapher/issue-549
...
Make block count on stats page configurable
2013-08-07 21:44:30 -07:00
Sebastian Grewe
0dbe1ebe11
fixing hashrate graphs
2013-08-07 09:45:40 +02:00
obigal
1819a47bf4
Vardiff/pushpool and pps payout support
2013-08-07 09:44:11 +02:00
obigal
360bd22dc6
Updates
2013-08-07 09:42:06 +02:00
obigal
fcb9ebd529
Update statistics.class.php
2013-08-07 09:41:19 +02:00
obigal
6f3a7c5b50
Update share.class.php
2013-08-07 09:40:25 +02:00
obigal
99bb4470f3
Update smarty_globals.inc.php
2013-08-07 09:40:25 +02:00
obigal
1f2bc294f2
Update for pushpool compatibility
2013-08-07 09:39:04 +02:00
obigal
84e22ae4a9
Update share.class.php
2013-08-07 09:36:26 +02:00
obigal
a7278401b0
Update smarty_globals.inc.php
2013-08-07 09:34:55 +02:00
obigal
f4451aee1c
Update share.class.php
2013-08-07 09:33:41 +02:00
obigal
f452f79f07
Update statistics.class.php
2013-08-07 09:32:51 +02:00
obigal
691611eb13
Update share.class.php
2013-08-07 09:30:39 +02:00
obigal
ef234fe80b
Vardiff/pushpool and pps payout support
2013-08-07 09:29:48 +02:00
obigal
c3a63d58ce
Updates
2013-08-07 09:29:48 +02:00
obigal
b6f3fd5972
Update statistics.class.php
2013-08-07 09:29:48 +02:00
obigal
5607103d81
Update share.class.php
2013-08-07 09:29:48 +02:00
