Sebastian Grewe
cfe1caa643
[CLEANUP] Fixed Typos
2014-04-11 12:41:05 +02:00
Sebastian Grewe
e8488215bc
[CLEAN] Array formatting
2014-04-11 09:01:32 +02:00
Sebastian Grewe
190bf86de8
Merge pull request #2105 from raistlinthewiz/development
...
Fixed php warnings caused by api/getpoolinfo
2014-04-10 12:55:59 +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
af8e15d4dc
Merge pull request #2102 from MPOS/drop-mpos-theme
...
[DELETE] Deprecated MPOS theme for 1.0.0
2014-04-08 16:45:43 +02:00
Sebastian Grewe
faf241f48e
[DELETE] Deprecated MPOS theme for 1.0.0
2014-04-08 16:41:35 +02:00
Sebastian Grewe
5907f34e10
Merge pull request #2098 from barrybingo/development
...
Reword T&C's last point as points are no longer numbered.
2014-04-07 12:15:55 +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
166c44fd89
Merge branch 'development' of https://github.com/MPOS/php-mpos into development
2014-04-06 17:31:47 +02:00
Sebastian Grewe
870ad52985
[FIX] PHP Notice on failed crons
2014-04-06 17:31:42 +02:00
Sebastian Grewe
d49c2ff9b7
Merge pull request #2097 from iAmShorty/cronjob-php-notice
...
[FIX] PHP notice in cronjob
2014-04-06 17:29:29 +02:00
iAmShorty
a8d633e7ba
[FIX] PHP notice in cronjob
2014-04-06 17:05:59 +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
Sebastian Grewe
dbe8a5c31a
Merge pull request #2094 from brettcannon/patch-1
...
Typo: "paypout" -> "payout"
2014-04-06 01:02:44 +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
Sebastian Grewe
7a60ec3627
Merge pull request #2090 from iAmShorty/move-donors-to-stats
...
[UPDATE] move donors to stats
2014-04-05 09:34:28 +02: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
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
