Commit Graph

377 Commits

Author SHA1 Message Date
Sebastian Grewe
b6aa1cbc66 Merge branch 'development' into bootstrap 2014-03-25 09:32:36 +01:00
iAmShorty
22b6901149 [FIX] getbalance fix for coins with getbalance problems 2014-03-25 09:20:48 +01:00
Sebastian Grewe
5c4112d598 Merge branch 'development' into bootstrap 2014-03-19 17:05:38 +01:00
Sebastian Grewe
6860040135 Revert "Update round_shares.tpl"
This reverts commit 13e39f6eae.
2014-03-18 10:13:17 +01:00
Sebastian Grewe
0d58427d76 Revert "Fix round share percentages"
This reverts commit 35e67b613f.
2014-03-18 10:13:06 +01:00
SamuelNZ
50cae464da Update navigation.tpl
More elegant, and fixes placement issue in chrome.
2014-03-18 18:24:27 +13:00
Sebastian Grewe
e863ef3a0a Merge branch 'development' into bootstrap 2014-03-17 15:53:53 +01:00
Sebastian Grewe
38177c9692 Merge pull request #1950 from toxicwind/next
Fix Round Share Percentages
2014-03-17 08:51:23 +01:00
toxicwind
13e39f6eae Update round_shares.tpl 2014-03-16 18:56:30 -06:00
toxicwind
35e67b613f Fix round share percentages
Not correct math.
2014-03-16 18:54:47 -06:00
Sebastian Grewe
32054045fb Merge branch 'development' into bootstrap 2014-03-11 09:33:03 +01:00
Sebastian Grewe
9941c61449 [FIX] Disable monitor column on admin pool workers 2014-03-11 08:48:34 +01:00
Sebastian Grewe
4f01b277fb [FIX] Disable monitor option in workers page 2014-03-10 14:20:12 +01:00
Sebastian Grewe
d289b422f3 [ADDED] IDLE Worker Global Switch
Fixes #1921 once merged.
2014-03-10 13:40:23 +01:00
Sebastian Grewe
7e49e90996 [Merge] Fix conflicts with development 2014-03-07 08:37:51 +01:00
Sebastian Grewe
581f365628 [FIX] Removed +x bit 2014-03-07 08:24:34 +01:00
Sebastian Grewe
c3ad49aab2 [FIX] Remove +x bits 2014-03-06 18:40:57 +01:00
iAmShorty
1c41534b17 Merge pull request #1884 from iAmShorty/wallet-balance-newmint-fix
[FIX] Wallet Balance Newmint Calc Fix
2014-03-06 11:45:36 +01:00
iAmShorty
e03010b56e [FIX] removed calc 2014-03-05 13:27:45 +01:00
iAmShorty
d8decf221b [UPDATE] minimum manual payout 2014-03-05 12:58:08 +01:00
iAmShorty
963b76ed80 [STYLE] added icons to notifications 2014-03-05 11:28:18 +01:00
iAmShorty
6eed6ece68 [FIX] added newmint wallet fix 2014-03-05 11:08:38 +01:00
iAmShorty
5cab314689 [FIX] changed template and calc 2014-03-04 11:59:10 +01:00
iAmShorty
c2747a183b [FIX] closing if 2014-03-04 11:51:36 +01:00
iAmShorty
bba3781ebf [FIX] Wallet Balance Newmint Calc Fix 2014-03-04 11:48:28 +01:00
rog1121
93981f6044 Various Fixes 2014-03-01 17:57:43 -07:00
rog1121
7e3623d659 Various Fixes 2014-03-01 17:56:23 -07:00
Sebastian Grewe
8ac9aa8500 Merge branch 'master' into bootstrap 2014-03-01 22:28:20 +01:00
Sebastian Grewe
0b2aecbad9 Merge branch 'master' into development 2014-03-01 19:00:11 +01:00
Sebastian Grewe
8bcce6c37d Merge branch 'development' into bootstrap 2014-03-01 13:50:55 +01:00
Sebastian Grewe
735bdadd88 [FIX] Payout notification type in list 2014-03-01 13:50:03 +01:00
Contex
4d2606bedc Fixed table cells for general_stats.tpl
<th></td> is obviously wrong
2014-02-28 21:09:28 +01:00
iAmShorty
549d4dd749 [BOOTSTRAP] basic implementation 2014-02-27 17:45:48 +01:00
Sebastian Grewe
9ad568a1d1 [FIX] Do not use CTOKEN if CSRF disabled
* [FIX] Workers page not checking for CTOKEN properly

Fixes #1848 once merged.
2014-02-27 11:56:46 +01:00
iAmShorty
6fb8f835ed [FIX] added >= to values 2014-02-26 11:18:59 +01:00
Sebastian Grewe
bcc45e22cf [FIX] Same fix for hashrate list
Formatting updated
2014-02-26 10:47:10 +01:00
Sebastian Grewe
6df2010b53 [FIX] Donor icons out of order 2014-02-26 10:42:45 +01:00
Sebastian Grewe
858c2cb24c Merge pull request #1826 from iAmShorty/PoS-Balance-Fix
[FIX] Newmint Payout Fix
2014-02-26 09:53:17 +01:00
Sebastian Grewe
9955b1ec5c Merge pull request #1829 from iAmShorty/donor-icons
[UPDATE] nicer donor icons
2014-02-26 09:53:03 +01:00
iAmShorty
20374a1eac [UPDATE] changed template 2014-02-26 09:35:50 +01:00
iAmShorty
9ae66915c8 [UPDATE] added Asteroids MacOS Miner 2014-02-25 12:49:57 +01:00
iAmShorty
54652cb93f [FIX] added default values 2014-02-25 09:29:09 +01:00
iAmShorty
c39db3bec3 [UPDATE] changed icons 2014-02-25 09:10:06 +01:00
iAmShorty
a52909d909 [UPDATE] changed icons 2014-02-25 08:53:12 +01:00
iAmShorty
67ca76279d [UPDAT] added footer, cleanup 2014-02-24 22:48:57 +01:00
iAmShorty
3381b0e60a [FIX] Typo 2014-02-24 21:24:03 +01:00
iAmShorty
8b3d5ec138 [UPDATE] nicer donor icons 2014-02-24 21:16:15 +01:00
iAmShorty
c6b060dbd5 [FIX] Newmint Payout Fix 2014-02-24 20:31:53 +01:00
Sebastian Grewe
b2f555a83a Merge pull request #1820 from iAmShorty/users-registered
[UPDATE] Adding registrations and Regdate to Admin Dashboard and Userinfo
2014-02-24 15:02:55 +01:00
iAmShorty
42aa77c454 [UPDATE] links in dashboard, cleanup dashboard 2014-02-24 14:49:42 +01:00