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
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
022430dddb
[FIX] Logic error for notification setting
2014-04-04 12:26:08 +02:00
Sebastian Grewe
ae7d321de4
[FIX] Merge conflict
2014-04-04 10:34:04 +02:00
Sebastian Grewe
e1be46b6eb
[FIX] Skip locked accounts
2014-04-04 10:25:35 +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
iAmShorty
68d87633e2
[FIX] updated styles, typos and colors
2014-04-02 17:35:56 +02:00
iAmShorty
0c75662352
[UPDATE] adding moot
2014-03-31 16:19:56 +02:00
Nathan Patten
116fff9d14
[EDIT] Add progress for MPOS-Bot to API call
2014-03-31 18:41:41 +11: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
b6aa1cbc66
Merge branch 'development' into bootstrap
2014-03-25 09:32:36 +01:00
iAmShorty
1ca9c9e336
[UPDATE] removed baseline shares from api
2014-03-24 17:58:07 +01:00
Sebastian Grewe
88e3edbd84
[MERGE] Fix merge conflict
2014-03-19 17:24:18 +01:00
Sebastian Grewe
3c537d577e
[FIX] Target Bits on Dashboard
2014-03-19 17:15:19 +01:00
iAmShorty
452d468843
[UPDATE] added datatable to user info
2014-03-19 16:09:48 +01:00
Sebastian Grewe
89fad152fe
[FIX] Logic error
2014-03-12 11:10:14 +01:00
Sebastian Grewe
fd30568af7
[CLEANUP] In-line with rest of account pages
2014-03-12 11:03:37 +01:00
iAmShorty
d9cfd2a9d4
[FIX] user earnings only visible as admin
2014-03-12 11:01:18 +01: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
7a86b827d5
[FIX] min payout fix, balance not initialized
2014-03-05 18:51:17 +01:00
iAmShorty
faf414e669
[FEATURE] added minimum payout
2014-03-05 15:02:16 +01:00
Sebastian Grewe
f72cdf3842
Merge pull request #1891 from iAmShorty/minimum-payout
...
[UPDATE] minimum manual payout
2014-03-05 13:50:43 +01:00
iAmShorty
75945eb5b0
[FIX] added minimum payout to notification message
2014-03-05 13:26:02 +01:00
iAmShorty
d8decf221b
[UPDATE] minimum manual payout
2014-03-05 12:58:08 +01:00
Sebastian Grewe
4136cc739b
[CHANGE] Show 10 instead of 5 blocks on pool stats
2014-03-04 18:18:53 +01:00
iAmShorty
e48bb249e8
[UPDATE] hide lastlogin message without site reload
2014-03-04 15:50:03 +01:00
iAmShorty
57e6b2dd8c
[FIX] permission fix
2014-03-03 17:34:53 +01:00
iAmShorty
887eef3f37
[FIX] fixed typo in notification class
2014-03-03 17:34:09 +01:00
iAmShorty
1960df0d91
[UPDATE] updated query and template
2014-03-03 16:59:06 +01:00
iAmShorty
84b62aedbd
[FEATURE] timeframed earning stats
2014-03-03 15:43:23 +01:00
Sebastian Grewe
0ce22ebf7a
[ADDED] Template Editor
2014-03-03 11:44:06 +01:00
Sebastian Grewe
b59f878c22
[MERGE] Development, merge conflicts fixed
2014-03-03 10:50:58 +01:00
rog1121
73f4cafc28
Use Defined Limit
2014-03-02 12:16:14 -07:00
rog1121
b8aa9f8738
Update getusertransactions.inc.php
2014-03-02 12:07:22 -07:00
iAmShorty
9fa4b17207
[CHANGE] move transaction summary to earnings to add timeframed stats later
2014-03-02 18:08:38 +01:00
iAmShorty
6705f879b1
[UPDATE] total user earnings, icons in invitations
2014-03-02 17:36:21 +01:00
Sebastian Grewe
8b13d0193e
[REVERT] Permission changes
2014-03-02 08:20:22 +01:00
rog1121
d6b223c9be
Permissions Fix
2014-03-01 18:25:58 -07: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
