Sebastian Grewe
f87a7fc380
Merge branch 'next' into issue-145
2013-09-06 10:55:31 +02:00
Sebastian Grewe
6b40c0898a
Merge pull request #641 from TheSerapher/issue-543
...
Issue 543
2013-09-06 01:52:43 -07: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
ab6a4f57d3
further implemetation into mmcfe-ng
2013-09-06 10:29:42 +02:00
Sebastian Grewe
b3ba080345
obigals work, cherrypicked
2013-09-06 09:48:08 +02:00
Sebastian Grewe
5b353ab759
Merge branch 'next' into issue-543
2013-09-06 09:40:28 +02:00
Sebastian Grewe
38256bb024
Merge pull request #637 from Dids/next
...
Updated Pools
2013-08-28 01:11:11 -07:00
Dids
c578ed21f1
Updated Pools
2013-08-27 23:01:35 +03:00
Sebastian Grewe
c849dd0245
Merge pull request #635 from TheSerapher/issue-610
...
Fix: Blocks not being confirmed
2013-08-26 02:12:46 -07: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
0a4047420b
Merge pull request #631 from TheSerapher/issue-630
...
Fix: Properly send notifications again
2013-08-23 02:45:11 -07:00
Sebastian Grewe
e6cf43efa0
Fix: Properly send notifications again
...
Fixes #630
2013-08-23 11:28:07 +02:00
Sebastian Grewe
a98080ec13
adding missing THEME_DIR to dist config
2013-08-22 16:32:06 +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
75d0dfe5f7
adding share rate to all sidebars
2013-08-22 14:18:04 +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
c1861f77a5
Merge pull request #625 from TheSerapher/issue-624
...
Fixing hashrate graphs
2013-08-22 02:34:32 -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
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
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
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
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
