Sebastian Grewe
1387bbdf44
[MERGE] Merge conflict NEXT
2013-09-18 16:34:52 +02:00
Sebastian Grewe
49b6ebe62f
Also show negative cold coins
...
Fixes #660
2013-09-17 16:49:11 +02:00
Sebastian Grewe
e7f62134f1
adding cold wallet coin display and setting
2013-09-17 16:15:18 +02:00
Sebastian Grewe
04786aafb5
Merge branch 'next' into issue-145
2013-09-17 08:53:21 +02:00
Sebastian Grewe
aa10b6efc1
[FEATURE] Adding hashrate modifiers
...
* Allow admins to set hashrate speed displays via admin panel
* Personal
* Pool
* Network
* Allows for easier integration of SHA coins
Fixes #652
2013-09-13 13:36:36 +02:00
Sebastian Grewe
62c0641131
Merge branch 'next' into issue-145
2013-09-09 14:53:42 +02:00
Sebastian Grewe
8ae36844f1
fixing some PHP warnings
2013-09-07 20:53:28 +02:00
Sebastian Grewe
f87a7fc380
Merge branch 'next' into issue-145
2013-09-06 10:55:31 +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
75d0dfe5f7
adding share rate to all sidebars
2013-08-22 14:18:04 +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
eacb8dff03
updated templates
2013-08-22 11:30:27 +02:00
Sebastian Grewe
36d64b27fd
adding share rate to prop sidebar
2013-08-22 11:28:01 +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
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
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
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
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
e5cb4d0886
Fixing combined hashrate graph
...
This shouuld fix #598 with graphs being completely off
2013-08-14 11:23:14 +02:00
Sebastian Grewe
184ad5d58b
fixing color of total percentage again
2013-08-14 11:15:49 +02: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
c0e8459519
fix coloring of total percentage
2013-08-14 10:59:50 +02: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
7214d27d9e
make blocks list sortable
2013-08-09 14:58:46 +02:00
Sebastian Grewe
71abaf29f3
Merge pull request #583 from TheSerapher/issue-581
...
Issue 581
2013-08-09 05:58:12 -07:00
Sebastian Grewe
d42b66d94e
removing useless strings
2013-08-08 12:09:50 +02:00
Sebastian Grewe
1a459a7913
Adding transaction summary by types
...
Addresses #581
2013-08-08 12:02:39 +02:00
Sebastian Grewe
92623902b2
adding round shares back to PPS sidebar
2013-08-08 10:03:33 +02:00
Sebastian Grewe
c568683152
Adding empty example for round stat integration
...
Addresses #543
2013-08-08 10:01:33 +02:00
Sebastian Grewe
aad8271a13
Fix blockexplorer links to use blockhash not height
...
Fixes #571
2013-08-08 09:42:10 +02:00
Sebastian Grewe
6767b5a235
Merge pull request #576 from TheSerapher/issue-561
...
Issue 561
2013-08-07 21:46:44 -07:00
obigal
360bd22dc6
Updates
2013-08-07 09:42:06 +02:00
obigal
45d5db65c8
Update default.tpl
2013-08-07 09:34:55 +02:00
obigal
86d4ec18cd
Update authenticated.tpl
2013-08-07 09:34:01 +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
2d2f480888
Update default.tpl
2013-08-07 09:29:48 +02:00
obigal
2b1c628238
Update authenticated.tpl
2013-08-07 09:29:47 +02:00
Sebastian Grewe
073a42cfc8
Fixing worker hashrates and activity status
...
* Fix hashrate calculations and include archived shares
* Fix worker activity to only check for our_result = Y shares
* Mark as active if worker has a hashrate > 0, removes a query
Addresses #561 , crons need to be updated to remove the active flag from
as the worker activity and check the hashrate instead.
2013-08-07 09:20:08 +02:00
Sebastian Grewe
fafd75d994
Honor anonymous flag on mobile template
...
Fixes #535
2013-08-07 08:59:22 +02:00