Sebastian Grewe
5e1c3ae372
fixing issue mentioned in #145 with payouts
2013-09-12 13:22:39 +02:00
Sebastian Grewe
62c0641131
Merge branch 'next' into issue-145
2013-09-09 14:53:42 +02:00
Sebastian Grewe
bc7e511177
removing debug echos
2013-09-06 15:00:47 +02:00
Sebastian Grewe
5257001153
fixing blockhash in round block details
2013-09-06 14:55:44 +02:00
Sebastian Grewe
f87a7fc380
Merge branch 'next' into issue-145
2013-09-06 10:55:31 +02:00
Sebastian Grewe
b656be751d
indentations
2013-09-06 10:51:55 +02:00
Sebastian Grewe
d4ce764d77
proper allow back/forth on blocks
2013-09-06 10:49:19 +02:00
Sebastian Grewe
b3ba080345
obigals work, cherrypicked
2013-09-06 09:48:08 +02:00
Sebastian Grewe
0e27cda093
Fix: Blocks not being confirmed
...
Fixes an issue introduce with #610 .
2013-08-26 11:11:52 +02:00
Sebastian Grewe
e6cf43efa0
Fix: Properly send notifications again
...
Fixes #630
2013-08-23 11:28:07 +02:00
Sebastian Grewe
6eec747be6
fixing PPLNS payouts one last time
2013-08-22 16:16:04 +02:00
Sebastian Grewe
db754c146e
Revert "Revert "adjusting pplns target to baseline shares""
...
Reverting the revert .... :-/
This reverts commit 2d27132725
2013-08-22 15:20:46 +02:00
Sebastian Grewe
927fc12cb3
fixing admin panel user info
2013-08-22 15:01:00 +02:00
Sebastian Grewe
2d27132725
Revert "adjusting pplns target to baseline shares"
...
* Shares are already baselined when calculating rounds
This reverts commit c9a8f8dc65
2013-08-22 14:51:30 +02:00
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
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
526701d2e1
Merging with origin/next to get branch updated
2013-08-20 15:55:05 +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
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
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
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
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
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
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
obigal
d89c1f43c8
Update for pushpool compatibility
2013-08-07 09:29:48 +02:00
obigal
41183b2e65
Update for pushpool compatibility
2013-08-07 09:29:48 +02:00
obigal
657839014a
Update for pushpool compatibility
2013-08-07 09:29:48 +02:00
