Commit Graph

2459 Commits

Author SHA1 Message Date
Sebastian Grewe
e8488215bc [CLEAN] Array formatting 2014-04-11 09:01:32 +02:00
Hüseyin Uslu
722642f39c Merge branch 'development' of https://github.com/MPOS/php-mpos into development 2014-04-10 13:34:31 +03:00
Hüseyin Uslu
320b26d058 fixed php warnings in api/getpoolinfo 2014-04-10 13:33:18 +03:00
Sebastian Grewe
827f5cebe2 Merge branch 'development' of https://github.com/MPOS/php-mpos into development 2014-04-08 16:46:26 +02:00
Sebastian Grewe
a064326bed [DELETE] MPOS site assets 2014-04-08 16:46:17 +02:00
Sebastian Grewe
faf241f48e [DELETE] Deprecated MPOS theme for 1.0.0 2014-04-08 16:41:35 +02:00
Boris
43c3239b0a Reword T&C's last point as points are no longer numbered. 2014-04-07 11:03:59 +01:00
iAmShorty
be83880e1d [FIX] firefox bug
aligning the dropdowns
2014-04-07 11:48:37 +02:00
Sebastian Grewe
0677321259 [CLEANUP] Use of isset instead of @ 2014-04-07 09:55:02 +02:00
Sebastian Grewe
870ad52985 [FIX] PHP Notice on failed crons 2014-04-06 17:31:42 +02:00
Sebastian Grewe
7e38b98e8f [FIX] Unset website email, mail issues 2014-04-06 10:05:08 +02:00
Sebastian Grewe
5e0faa6e7a Merge pull request #2095 from brettcannon/patch-2
Typo: "paypout" -> "payout"
2014-04-06 01:03:02 +02:00
Brett Cannon
b2a189c3f0 Typo: "paypout" -> "payout" 2014-04-05 18:13:14 -04:00
Brett Cannon
73137ac6e0 Typo: "paypout" -> "payout" 2014-04-05 18:12:44 -04:00
iAmShorty
601c3943fb [UPDATE] move donors to stats 2014-04-05 08:58:49 +02:00
Sebastian Grewe
017dd5bc82 Merge pull request #2088 from MPOS/pool-newsletter
Pool newsletter
2014-04-04 13:52:13 +02:00
Sebastian Grewe
f54ece7ee9 [FIX] Return defaults with no settings at all 2014-04-04 12:51:15 +02:00
Sebastian Grewe
022430dddb [FIX] Logic error for notification setting 2014-04-04 12:26:08 +02:00
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
Sebastian Grewe
e1be46b6eb [FIX] Skip locked accounts 2014-04-04 10:25:35 +02:00
iAmShorty
3b26d455c2 rebase 2014-04-04 10:25:00 +02:00
Sebastian Grewe
739f035087 [ADDED] Admin Pool Newsletter
* Added throttle option to swiftmailer for SMTP limiting
* Added newsletter page for admin panel
* Added newsletter mail template (simple one for now)
* Added new global configuration option
* Added default notification setting system in notification class
* Added global pool newsletter enable/disable switch in admin settings

Fixes #2087 once merged.
2014-04-04 10:05:12 +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
3986a24d86 [FIX] number format in block overview 2014-04-02 15:56:26 +02:00
iAmShorty
040e2baa35 [FIX] responsive tables 2014-04-02 15:10:58 +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
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