Commit Graph

3456 Commits

Author SHA1 Message Date
Sebastian Grewe
37f50256ab Merge branch 'development' of https://github.com/MPOS/php-mpos into development 2014-04-04 10:34:55 +02:00
Sebastian Grewe
ae7d321de4 [FIX] Merge conflict 2014-04-04 10:34:04 +02:00
iAmShorty
22e9a62d4e [UPDATE] style fixes 2014-04-04 10:30:14 +02:00
iAmShorty
37cdadbabc rollback 2014-04-04 10:28:49 +02:00
Sebastian Grewe
0b54cac402 Merge pull request #2085 from barrybingo/development
[FIX] Remove static table references
2014-04-04 10:26:32 +02:00
iAmShorty
3b26d455c2 rebase 2014-04-04 10:25:00 +02:00
iAmShorty
51e97eceb7 Merge pull request #2086 from iAmShorty/disable-qrcode
[UPDATE] hide/show qrcode page
2014-04-03 17:07:14 +02:00
iAmShorty
8b6f291384 [UPDATE] hide/show qrcode page 2014-04-03 16:25:31 +02:00
Boris
4702339b9a [FIX] Remove static table references 2014-04-03 14:52:01 +01:00
iAmShorty
88aa40351b [FIX] typo 2014-04-02 17:37:02 +02:00
iAmShorty
68d87633e2 [FIX] updated styles, typos and colors 2014-04-02 17:35:56 +02:00
iAmShorty
700c9f646b Merge pull request #2083 from iAmShorty/number-format-fix
[FIX] number format in block overview
2014-04-02 15:57:49 +02:00
iAmShorty
3986a24d86 [FIX] number format in block overview 2014-04-02 15:56:26 +02:00
Sebastian Grewe
4aaf355897 Merge pull request #2082 from iAmShorty/responsive-tables-fix
[FIX] responsive tables
2014-04-02 15:14:38 +02:00
iAmShorty
040e2baa35 [FIX] responsive tables 2014-04-02 15:10:58 +02:00
Sebastian Grewe
9e256904f9 Merge pull request #2081 from iAmShorty/popup-fix
[FIX] notification popup fix
2014-04-02 13:52:10 +02:00
iAmShorty
4527d4793d [UPDATE] delete cookies on login 2014-04-02 13:47:25 +02:00
iAmShorty
477ed0884d [FIX] notification popup fix 2014-04-02 13:32:23 +02:00
Sebastian Grewe
7ef96312bf [CHANGE] Use n/a for estimates on 0 net hashrate 2014-04-02 10:46:59 +02:00
Sebastian Grewe
7a87c09056 [FIX] Devision by 0 on missing nethashrate 2014-04-02 10:46:30 +02:00
iAmShorty
09b303fa49 [FIX] typo 2014-04-01 00:05:18 +02:00
iAmShorty
a1e8c08808 Update default.tpl 2014-03-31 23:58:46 +02:00
iAmShorty
a9aedbf603 Update default.tpl 2014-03-31 23:56:53 +02:00
iAmShorty
5edb15a834 Update green.css 2014-03-31 23:53:11 +02:00
iAmShorty
f2588e043c Update blue.css 2014-03-31 23:52:44 +02:00
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