RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,676 Commits 4 Branches 11 Tags 14 MiB
e1afcfdbcc
Commit Graph

2529 Commits

Author SHA1 Message Date
Sebastian Grewe
1e1bbaaa92 [FIX] PHP Notice 2014-04-19 08:06:26 +02:00
Sebastian Grewe
5da9e12f11 Merge pull request #2124 from iAmShorty/cleaner-adminmenu 
[UPDATE] cleaner navigation in admin menu
 2014-04-19 08:05:44 +02:00
Glen
f9b8a45223 Corrected IF Statement End 
Sorry just realised if statement was incorrect in my last push - corrected here.
 2014-04-18 00:52:37 +10:00
Glen
08ca41d451 Remove MEGA Crap From Getting Started 
What's the go with all the MEGA references? - talk about a way of promoting MEGA? I have removed all references and replaced with reputable links where possible except the CGMiner 3.7.2 download link - I'll try and find a better one and update later.

Reason for this change is because MEGA is prompting users to download the application/join the site.
 2014-04-18 00:27:57 +10:00
iAmShorty
91db296aec [UPDATE] cleaner navigation in admin menu 2014-04-17 11:18:43 +02:00
Sebastian Grewe
da5414d5b5 [FIX] Proper default format 2014-04-17 06:53:46 +02:00
Sebastian Grewe
1a97f41f52 [ADDED] System Date Format string 
* [ADDED] New admin panel config option in System
* [UPDATED] Use new date format on all templates

Fixes #2118 once merged.
 2014-04-17 06:49:19 +02:00
Sebastian Grewe
a7393f0a81 Merge pull request #2121 from daygle/patch-3 
Scrypt/SHA256 Friendly Changes (Getting Started)
 2014-04-17 06:16:00 +02:00
Sebastian Grewe
1a706436a2 Merge pull request #2120 from daygle/patch-2 
Hide Point 5 In Getting Started - SHA256 Coins
 2014-04-17 06:14:33 +02:00
Glen
05d4a8925f Scrypt/SHA256 Friendly Changes (Getting Started) 
Correctly display miner download links depending on coin used scrypt/SHA256.
 2014-04-17 11:20:22 +10:00
Glen
cc645d24c5 Hide Point 5 In Getting Started - SHA256 Coins 
Hide irrelevant details in point 5 when SHA256 coin is used.
 2014-04-17 11:05:45 +10:00
Glen
4b2dd64ff9 Update default.tpl 
Corrected spacing when --script is omitted.
 2014-04-17 10:42:45 +10:00
Sebastian Grewe
16a1ca641a [ADDED] Worker totals on Dashboard 
* Added worker hashrate sum
* Added refresh interval information to dashboard footer
* Added number formatting to hashrate
 2014-04-16 22:15:34 +02:00
Sebastian Grewe
43a362afab [CLEANUP] Use coin class for worker hashrate calcs 
* Worker class was not using coin class for calculations
* Should improve runtime for worker status related queries
 2014-04-16 21:41:41 +02:00
Sebastian Grewe
554742c139 [SECURITY] Fixed 2FA on the account edit page 
* Fixes 2FA Tokens on the account page
* 2FA was skipped until now :-/

No open ticket for this, reported by dev.
 2014-04-16 19:32:49 +02:00
Sebastian Grewe
a5fe6236e1 [SECURITY] Removed SQL Templates 
* Remove the entire SQL template system
* Secuirty issues arose that can't easily be fixed in MPOS
* For the sake of site security, these have been completely removed

! Will require the `templates/cache/bootstrap` and `template/compile/bootstrap`
folders to be removed if custom SQL templates were used !

Will fix #2114 once merged.
 2014-04-16 19:02:28 +02:00
Sebastian Grewe
54a1452d45 [ADDED] User Details page for admins 2014-04-11 16:33:00 +02:00
Sebastian Grewe
233c0c7e8a [VERSION] Config file version check 2014-04-11 12:44:35 +02:00
Sebastian Grewe
2fdf94c9c5 [VERSION] Config 0.0.8 due to typos 2014-04-11 12:41:34 +02:00
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
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
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
SamuelNZ
9418c48ee8 Update mpos.css 
Fixes positioning errors
 2014-03-30 22:44:10 +13:00
SamuelNZ
99f4417f1f Update default.tpl 
Update to my update.
 2014-03-30 20:59:33 +13: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
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
nrpatten
8a272da7ae [FIX] table overflow ref issue #2022 2014-03-27 19:09:44 -07: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