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
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
iAmShorty
3541d05958 [FIX] socket timeout setting 2014-03-27 17:46:11 +01:00
iAmShorty
79478ceb55 [FIX] stratum connect with timeout 
i think i found a smarter solution without while and sleep
 2014-03-27 17:23:21 +01:00
Sebastian Grewe
6159123551 [CLEANUP] Admin Checks formatting and better exit message 2014-03-27 14:45:45 +01:00
Sebastian Grewe
623fc4c394 [ADDED] Sendmail/SMTP configuration options 2014-03-27 08:31:29 +01:00
Sebastian Grewe
59d9a9a5d7 [REPLACED] PHP mail() with Swiftmailer 2014-03-27 07:55:23 +01:00
Sebastian Grewe
1d8fd33560 [FIX] PPS 24 hour estimates 2014-03-27 07:31:09 +01:00
nrpatten
222979e8fe [FIX] Login Form/Registration Form Look 2014-03-26 16:41:09 -07:00
iAmShorty
2c81712754 [FIX] stratum poke timeout error 2014-03-26 20:56:30 +01:00
iAmShorty
26c0ee772d [FIX] user invitations style fix 2014-03-26 20:07:20 +01:00
iAmShorty
2cc6943048 [FIX] user invitations 2014-03-26 20:01:23 +01:00
Nathan Patten
3c6b6454b1 [FIX] Admin News Delete Icon 2014-03-27 00:20:19 +11:00
Sebastian Grewe
a555fa56bf [FIX] Removed duplicate method implementation 
Fixes #2020 once merged, thanks @Mezrin
 2014-03-26 11:15:42 +01:00
Sebastian Grewe
e45a29c7d0 Merge pull request #2019 from MPOS/development 
Development to Master
 2014-03-26 09:51:03 +01:00
Sebastian Grewe
e7d5397c56 [REMOVED] Backup files ... TsTsTs 2014-03-26 09:49:58 +01:00
Sebastian Grewe
acced2bed7 Merge pull request #1853 from MPOS/bootstrap 
[ENHANCEMENT] Bootstrap implementation
 2014-03-26 09:39:10 +01:00
nrpatten
ff6b2674d6 [FIX] Me Being Silly :P 2014-03-25 23:13:38 -07:00
nrpatten
557856e6db [UPDATE] More tweeks 2014-03-25 22:16:54 -07:00
nrpatten
07ba44786b [UPDATE] More color tweeks 2014-03-25 21:52:09 -07:00
nrpatten
dffd5a7edf [UPDATE] Couple of color tweeks 2014-03-25 21:35:02 -07:00
iAmShorty
b46479190f [FIX] style fix in admin news and css 2014-03-25 23:53:52 +01:00
iAmShorty
6a8784e4d9 [FIX] default design fix 2014-03-25 23:40:56 +01:00
VictorMezrin
6d67a32c59 Rearrange cron in UI to correspond to the actual order of work 2014-03-25 22:25:07 +04:00
iAmShorty
1087d486bd [UPDATE] hover links in dark theme 2014-03-25 16:37:11 +01:00
iAmShorty
3a7e358fc9 [UPDATE] some style changes, design switcher for own designs 2014-03-25 15:54:48 +01:00
Sebastian Grewe
662ff69224 [ADDED] Return-Path when sending mail 2014-03-25 11:31:02 +01:00
Sebastian Grewe
d51cfc0546 [UPDATE] Make bootstrap default template 2014-03-25 10:52:56 +01:00
iAmShorty
d454570852 [FIX] added getbalancewithunconfirmed to wallet template 2014-03-25 09:35:18 +01:00
Sebastian Grewe
b6aa1cbc66 Merge branch 'development' into bootstrap 2014-03-25 09:32:36 +01:00
iAmShorty
22b6901149 [FIX] getbalance fix for coins with getbalance problems 2014-03-25 09:20:48 +01:00
Sebastian Grewe
74d872755f Merge pull request #2002 from Contex/development 
Cloudflare IP forwarding when using getCurrentIP()
 2014-03-25 06:44:50 +01:00
Sebastian Grewe
56e757a7da Merge pull request #1994 from kthxbai2u/patch-1 
Update bootstrap.php
 2014-03-25 06:38:12 +01:00
iAmShorty
4dff6ee4e7 [UPDATE] style fix user transactions 2014-03-24 22:32:44 +01:00
Contex
d4c23fe1b2 Cloudflare IP forwarding when using getCurrentIP() 
HTTP_X_FORWARDED_FOR doesn't always work with Cloudflare,
HTTP_CF_CONNECTING_IP however does.

https://support.cloudflare.com/hc/en-us/articles/200170986-How-does-CloudFlare-handle-HTTP-Request-headers-
 2014-03-24 19:59:59 +01:00
iAmShorty
7d51e8f126 [FIX] broken mobile navigation 2014-03-24 19:40:35 +01:00
Sebastian Grewe
4b8db482d6 Merge pull request #1989 from SamuelNZ/patch-4 
Update mpos.css
 2014-03-24 19:19:04 +01:00
iAmShorty
1ca9c9e336 [UPDATE] removed baseline shares from api 2014-03-24 17:58:07 +01:00
iAmShorty
6d04c4f35c [FIX] style fix 2014-03-24 15:53:34 +01:00
nrpatten
fec49dbae9 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-24 03:17:38 -07:00
nrpatten
c15aaa6b05 [UPDATE] lightblue background with opacity 0.8 / font-weight 600 for description 2014-03-24 03:16:53 -07:00
iAmShorty
ad6f70f1ce [FIX] small style change for dropdown 2014-03-24 10:52:25 +01:00
iAmShorty
ad0feb3a20 [UPDATE] description update 2014-03-24 10:32:18 +01:00
iAmShorty
9d0700ee4b [UPDATE] added Pool Navigation to header and admin settings 2014-03-24 10:30:24 +01:00
Sebastian Grewe
c89b8075d1 [CLEANUP] Number formatting 2014-03-23 22:31:06 +01:00
John Doe
1de50786ae Fix Typo 2014-03-23 14:05:45 -06:00
Shawn Read
94035b58f7 Update bootstrap.php 
Add in a more user friendly error that tells the user WHERE the script is looking for the file (in case the base path or other variable is wrong)
 2014-03-23 11:52:13 -04:00
nrpatten
13590f6520 [UPDATE] Teal Backgrond for Pool Information Round Information Not so harsh on the eyes 2014-03-23 01:14:08 -07:00
nrpatten
a9f23862a8 [FIX] contributors share/hashrate highlight 2014-03-22 17:41:04 -07:00
nrpatten
ab96fcf85f [FIX] More HTML Errors [FIX] contributors share/hashrate highlight 2014-03-22 17:36:40 -07:00
nrpatten
48a34c4982 [FIX] HTML Errors 2014-03-22 17:07:08 -07:00
iAmShorty
c785af95c3 [UPDATE] changed link behavior 2014-03-23 00:42:11 +01:00
iAmShorty
5866cbb54d [UPDATE] changed link behavior 2014-03-23 00:37:55 +01:00
iAmShorty
bd4096bccb [UPDATE] added exchange url to price ticker 2014-03-22 21:12:55 +01:00
Sebastian Grewe
5b4727479f Merge branch 'development' into bootstrap 2014-03-22 14:39:49 +01:00
Sebastian Grewe
ad1db8dfca [FIX] Same for PPLNS Archive shares 2014-03-22 14:39:38 +01:00
Sebastian Grewe
441e71857a Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-22 14:26:33 +01:00
Sebastian Grewe
af3b0487b1 Merge branch 'development' into bootstrap 2014-03-22 14:26:23 +01:00
Sebastian Grewe
be50e8ab47 [FIX] Remove baseline conversion from PPLNS Targets 2014-03-22 14:26:12 +01:00
nrpatten
948fe892eb [FIX] More Style Margin 2014-03-22 05:12:36 -07:00
nrpatten
0aa75bd1d4 [FIX] More Style Margin 2014-03-22 05:11:41 -07:00
nrpatten
bfd0302782 [FIX] Style Margin 2014-03-22 05:03:29 -07:00
SamuelNZ
aa63eac2ea Update global.inc.dist.php 
Double vision
 2014-03-23 00:45:43 +13:00
iAmShorty
bd57e048e6 [UPDATE] style fixes 2014-03-22 12:31:37 +01:00
nrpatten
cddb929e22 [FIX] HTML Fixes 2014-03-22 02:39:40 -07:00
nrpatten
7350178f48 [UPDATE] Pool Info Without Price 2014-03-22 02:21:07 -07:00
nrpatten
f0e0bf27a9 [UPDATE] Overview Icons 2014-03-22 02:03:32 -07:00
nrpatten
3e6854095e New Test Setout Round Props 2014-03-22 01:12:59 -07:00
nrpatten
02c70740ed New Test Setout Round Props 2014-03-22 01:12:22 -07:00
SamuelNZ
51b7cbdbee Update mpos.css 
Third time is the charm.
Added width constraint, Things can't display correctly otherwise (Alerts for instance)
Commented out the margin-left that was causing a issue similar to the dropdown-user
 2014-03-22 20:57:59 +13:00
Sebastian Grewe
b0fdb62c12 [LAYOUT] Blocks Stats page 2014-03-22 08:32:25 +01:00
nrpatten
20130b44a1 New Test Setout Round Stats Readd 2014-03-22 00:20:58 -07:00
nrpatten
f3f12d357c New Test Setout Round Stats 2014-03-22 00:15:56 -07:00
nrpatten
fd5591fbc4 New Test Setout 2014-03-22 00:09:37 -07:00
Sebastian Grewe
f9c57e8ca9 Merge pull request #1987 from SamuelNZ/patch-3 
Update bootstrap.min.css
 2014-03-22 08:01:09 +01:00
Sebastian Grewe
a00b84721a [DRAFT] PPS Dashboard 2014-03-22 07:36:13 +01:00
Sebastian Grewe
828481b235 [FIX] Worker Info Responsive 2014-03-22 07:20:51 +01:00
SamuelNZ
f78b20f108 Update mpos.css 
Makes more sense to change this actually.
 2014-03-22 16:12:22 +13:00
SamuelNZ
39da07462b Update mpos.css 
Add changes here instead as suggested.
 2014-03-22 16:06:34 +13:00
SamuelNZ
049d3bea28 Update bootstrap.min.css 
Reverted Changes
 2014-03-22 16:05:32 +13:00
SamuelNZ
1634d0acdd Update bootstrap.min.css 
Changed min-wdth of drop down menu too 100px
160px is too wide for when the template is in the smaller resolutions and has the user detail on the left, and it "falls off" the screen.
 2014-03-22 14:57:47 +13:00
Sebastian Grewe
5841eb458e Merge branch 'development' into bootstrap 2014-03-21 16:01:03 +01:00
Sebastian Grewe
d72b4f6a51 [REMOVED] Baseline from roundstats 2014-03-21 12:56:31 +01:00
Sebastian Grewe
055e4259e1 [REMOVED] Baseline shares from statistics 2014-03-21 12:54:29 +01:00
Sebastian Grewe
1f6ef81b9c [ADDED] SQL Upgrade Script 2014-03-21 12:47:24 +01:00
Sebastian Grewe
67a4713cf0 [REMOVED] Baseline Share calculations 
* We now track diff1 shares instead of converting into a baselined value
* PPS has been adjusted to payout shares directly
* Estimated Shares in coin_base adjusted
 2014-03-21 11:51:34 +01:00
iAmShorty
fb0dbbd8a1 [FIX] style fixes 2014-03-21 09:04:19 +01:00
Sebastian Grewe
0bdc124eb2 [FIX] Spelling mistake 
Thanks @szoyj
 2014-03-20 14:00:38 +01:00
Sebastian Grewe
e684a987cc [ADDED] Calc Coin PPS Value Method 2014-03-20 12:11:35 +01:00
iAmShorty
d0707c9be9 Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 2014-03-20 08:56:19 +01:00
iAmShorty
fe36acfb9d [UPDATE] responsive tables in wallet info 2014-03-20 08:55:57 +01:00
Sebastian Grewe
88e3edbd84 [MERGE] Fix merge conflict 2014-03-19 17:24:18 +01:00
Sebastian Grewe
c71bc991ef Merge pull request #1955 from MPOS/coin-plugin-system 
Coin plugin system
 2014-03-19 17:22:40 +01:00
Sebastian Grewe
3c537d577e [FIX] Target Bits on Dashboard 2014-03-19 17:15:19 +01:00
Sebastian Grewe
5c4112d598 Merge branch 'development' into bootstrap 2014-03-19 17:05:38 +01:00
Sebastian Grewe
b2d8c18def Merge branch 'development' 
* FIX: Cryptorush API & Wiki Updated
* ADDED: mintpal API ticker & Wiki Updated
* UPDATE: MPOS template updates - Thanks SamuelNZ
* CLEANUP: Dynamic table references in classes - Thanks @barrybingo
 2014-03-19 17:02:54 +01:00
Sebastian Grewe
457e40c24c [FIX] Cryptorush API fix 2014-03-19 16:44:37 +01:00
iAmShorty
9f9b4e94ef [FIX] update datatables css 2014-03-19 16:25:47 +01:00
iAmShorty
452d468843 [UPDATE] added datatable to user info 2014-03-19 16:09:48 +01:00
iAmShorty
f7e6e6a4ce [FIX] fixed datatables if arrays are empty 2014-03-19 15:54:13 +01:00
iAmShorty
40337e4627 [FIX] datatable issue with empty donors 2014-03-19 15:42:06 +01:00
Sebastian Grewe
e19f77f1ad [ADDED] Missing number_format 2014-03-19 15:22:08 +01:00