Commit Graph

3431 Commits

Author SHA1 Message Date
iAmShorty
1385e4ea5a Update dark.css 2014-03-31 23:51:59 +02:00
iAmShorty
9f6bbbc086 [UPDATE] Header title 2014-03-31 22:53:37 +02:00
Sebastian Grewe
11d75d8305 Merge pull request #2072 from iAmShorty/moot
[UPDATE] adding moot
2014-03-31 17:23:40 +02:00
iAmShorty
0c75662352 [UPDATE] adding moot 2014-03-31 16:19:56 +02:00
Sebastian Grewe
6ce8a049e4 [FIX] Est. next diff with 0 hashrate 2014-03-31 15:49:38 +02:00
Nathan Patten
fc94ec4df7 [FIX] Issue #2064 2014-03-31 18:58:31 +11:00
Nathan Patten
314eb10381 [FIX] Issue #2064 2014-03-31 18:56:35 +11:00
Nathan Patten
116fff9d14 [EDIT] Add progress for MPOS-Bot to API call 2014-03-31 18:41:41 +11:00
Sebastian Grewe
d7d364c90d [FIX] PPS Value after Ajax Refresh 2014-03-31 09:08:56 +02:00
Sebastian Grewe
5061386fb8 Merge pull request #2062 from SamuelNZ/development
Removing Some Inline CSS
2014-03-31 07:57:52 +02:00
SamuelNZ
828ebdf7fa [UPDATE] Syntax 2014-03-31 16:19:17 +13:00
SamuelNZ
981862a0de [UPDATE] Syntax 2014-03-31 16:18:33 +13:00
SamuelNZ
ca8bbcc0b9 [UPDATE] Transactions display
Fixes alignment issues with Transaction History.
2014-03-31 14:17:57 +13:00
SamuelNZ
a4738f8d18 [UPDATE] Small tweak 2014-03-31 14:01:17 +13:00
SamuelNZ
aea4900593 [UPDATE] 2014-03-31 14:00:07 +13:00
SamuelNZ
bd0ad4ecb7 Update block_overview_time.tpl
Oops, Missed one.
2014-03-31 12:55:50 +13:00
SamuelNZ
5546becf59 Update block_overview_time.tpl
Removing Inline CSS
2014-03-31 12:50:28 +13:00
SamuelNZ
d4c5d3197c Update mpos.css
Removing Inline CSS
2014-03-31 12:48:46 +13:00
Sebastian Grewe
a60a9cd690 Merge pull request #2060 from SamuelNZ/development
Update block_overview_time.tpl
2014-03-30 15:45:30 +02:00
SamuelNZ
86d81dca75 Update default.tpl
Target blank
2014-03-31 01:56:17 +13:00
SamuelNZ
afbf9b0709 Update block_overview_time.tpl
Cosmetic Improvements
2014-03-31 01:46:03 +13:00
Sebastian Grewe
1fe9cb4f8c Merge pull request #2058 from SamuelNZ/patch-1
Update mpos.css
2014-03-30 11:45:25 +02:00
SamuelNZ
9418c48ee8 Update mpos.css
Fixes positioning errors
2014-03-30 22:44:10 +13:00
Sebastian Grewe
1684b2e388 Merge pull request #2057 from SamuelNZ/patch-7
Update default.tpl
2014-03-30 10:01:16 +02:00
SamuelNZ
99f4417f1f Update default.tpl
Update to my update.
2014-03-30 20:59:33 +13:00
Sebastian Grewe
80b1ee043a Merge pull request #2056 from MPOS/master
Master to Development
2014-03-30 09:54:38 +02:00
Sebastian Grewe
d0c40baf60 Merge pull request #2055 from SamuelNZ/patch-6
Update default.tpl
2014-03-30 09:46:39 +02:00
SamuelNZ
4ace79f7a4 Update default.tpl
This was really out dated, i re-wrote for the pool i run and thought i would just paste it here as well.
2014-03-30 20:41:35 +13:00
Sebastian Grewe
4a4e276b76 Merge pull request #2033 from MPOS/development
UPDATE : Development to Master - NO VERSION
2014-03-29 22:08:16 +01:00
Sebastian Grewe
a70d6af9dd Merge pull request #2046 from LucasJones/development
Fix bug in admin dashboard
2014-03-28 20:08:02 +01:00
LucasJones
dbba22ca67 Fix bug in admin dashboard
Fixes a bug causing the admin dashboard to throw an error, when the wallet has an account name which is an integer (e.g. "1").

This is caused by json_decode decoding the account address as an integer, which is passed to getaddressesbyaccount, throwing an error (as the daemon only accepts string values for account names).
2014-03-28 19:02:06 +00:00
Sebastian Grewe
bd8ae40c20 Merge pull request #2037 from iAmShorty/style-fixes
[UPDATE] style fixes, new designs
2014-03-28 17:15:56 +01:00
Sebastian Grewe
a326cc315c Merge pull request #2044 from MPOS/add-bonus-earnings
[ADDED] Bonus to earnings page
2014-03-28 15:28:26 +01:00
Sebastian Grewe
ed517ed74c [ADDED] Bonus to earnings page 2014-03-28 15:25:35 +01:00
iAmShorty
9fb64901f0 [UPDATE] more style fixes 2014-03-28 14:05:33 +01:00
iAmShorty
9db6d7ecee [FIX] admin news div fix 2014-03-28 13:59:23 +01:00
iAmShorty
4b13360568 [UPDATE] more style fixes 2014-03-28 13:51:37 +01:00
iAmShorty
821d7ad473 [FIX] isset host 2014-03-28 13:28:25 +01:00
iAmShorty
f90f6152a3 [UPDATE] style fixes, new designs 2014-03-28 09:55:42 +01:00
Sebastian Grewe
3089d0729f Merge pull request #2042 from iAmShorty/notification-switch
[FIX] worker notification switch in user notifications
2014-03-28 09:40:07 +01:00
iAmShorty
5bb3727802 [FIX] worker notification switch in user notifications 2014-03-28 09:36:51 +01:00
Sebastian Grewe
a9d7726617 [FIX] Properly run all upgrades 2014-03-28 09:22:19 +01:00
Sebastian Grewe
ab2a065b9a [FIX] Removed duplicate SQL upgrade 2014-03-28 09:16:02 +01:00
nrpatten
8a272da7ae [FIX] table overflow ref issue #2022 2014-03-27 19:09:44 -07:00
Sebastian Grewe
69ea8d9702 Merge pull request #2038 from stambetto/development
Minor fixes
2014-03-27 20:21:44 +01:00
Stan Statev
da40fd7606 Merge branch 'development' of https://github.com/MPOS/php-mpos into development 2014-03-27 21:14:39 +02:00
Stan Statev
59f490d9d6 [FIX] Wrong Memcache file path for Windows based systems 2014-03-27 21:07:53 +02:00
Stan Statev
256d438861 [FIX] In case of SQL error function should return it 2014-03-27 21:06:37 +02:00
iAmShorty
3541d05958 [FIX] socket timeout setting 2014-03-27 17:46:11 +01:00
iAmShorty
79478ceb55 [FIX] stratum connect with timeout
i think i found a smarter solution without while and sleep
2014-03-27 17:23:21 +01:00