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

2459 Commits

Author SHA1 Message Date
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
iAmShorty
daf0703857 [UPDATE] added mintpal ticker api 2014-03-19 13:27:06 +01:00
iAmShorty
9f942a6a1a [FIX] added missing icons 2014-03-18 10:18:00 +01:00
Sebastian Grewe
6860040135 Revert "Update round_shares.tpl" 
This reverts commit 13e39f6eae.
 2014-03-18 10:13:17 +01:00
Sebastian Grewe
0d58427d76 Revert "Fix round share percentages" 
This reverts commit 35e67b613f.
 2014-03-18 10:13:06 +01:00
SamuelNZ
29594859db Update layout.css 
Adjusted to work with other proposed pull
 2014-03-18 18:34:43 +13:00
SamuelNZ
50cae464da Update navigation.tpl 
More elegant, and fixes placement issue in chrome.
 2014-03-18 18:24:27 +13:00
SamuelNZ
129f2ba09b Update layout.css 
min-width to stop distortion of Graphs when not in full screen, or on a smaller monitor.
 2014-03-18 17:54:34 +13:00
Sebastian Grewe
9d66c2f574 [FIX] Worker class 2014-03-17 17:08:38 +01:00
Sebastian Grewe
2089af60cd [FIX] Proper getTargetBits call 2014-03-17 16:21:19 +01:00
Sebastian Grewe
e863ef3a0a Merge branch 'development' into bootstrap 2014-03-17 15:53:53 +01:00
Sebastian Grewe
3694af742f Merge branch 'development' into coin-plugin-system 2014-03-17 15:53:40 +01:00
Boris
bf327a23a9 [FIX] Remove a couple more static table references 2014-03-17 14:49:27 +00:00
Sebastian Grewe
5fd4085a15 [MOVED] Coin Classes into own folder 2014-03-17 15:19:09 +01:00
Sebastian Grewe
1583877206 Merge branch 'development' into coin-plugin-system 2014-03-17 14:17:40 +01:00
Boris
0e61aaa9fe [FIX] Remove more static table references #1929 2014-03-17 12:55:13 +00:00
Sebastian Grewe
5d37a77958 [UPDATE] Blocks overview est shares 2014-03-17 13:28:31 +01:00
Sebastian Grewe
914df494ed [FIX] Access to protected var 2014-03-17 13:18:53 +01:00
Sebastian Grewe
46cfd2cf8c [POC] Replaced config target bits with coin base 
* Do not auto-set target bits via autoloader
* Use coin_base to declare target_bits
* Adjust target_bits in each coin_algo class instead

Addresses #1953
 2014-03-17 13:11:50 +01:00
Sebastian Grewe
7d17fd5eb5 [POC] Coin-based Classes 
* Added coin_base class to extend from
* Defaults in coin_base apply for scrypt/sha256d
* Added coin_scrypt and coin_sha256d that extend without changes
* Updated statistics class to use new coin class calls

Addresses #1953
 2014-03-17 12:54:02 +01:00
Sebastian Grewe
38177c9692 Merge pull request #1950 from toxicwind/next 
Fix Round Share Percentages
 2014-03-17 08:51:23 +01:00
toxicwind
13e39f6eae Update round_shares.tpl 2014-03-16 18:56:30 -06:00
toxicwind
35e67b613f Fix round share percentages 
Not correct math.
 2014-03-16 18:54:47 -06:00
Sebastian Grewe
9b36c9ac8e Merge pull request #1936 from MPOS/pool-bonus-feature 
[FEATURE] Added Pool Bonus for Prop and PPLNS
 2014-03-14 13:26:06 +01:00
Sebastian Grewe
914bc6bf1a [FIX] Use configured currency as target 2014-03-14 10:57:35 +01:00
Sebastian Grewe
d468c82694 [ADDED] Block or Payout based bonus percentage 2014-03-13 14:25:52 +01:00
nrpatten
d6244e3715 [FIX] Small Rez row center 2014-03-13 05:07:09 -07:00
iAmShorty
41c1af72f4 [UPDATE] style fixes 2014-03-13 11:35:45 +01:00
iAmShorty
c5788c5566 [FIX] fixed undefined index share 2014-03-13 11:28:07 +01:00
iAmShorty
69bf2400e4 [FIX] fixed progressbars style/color for efficiency 2014-03-13 09:34:20 +01:00
iAmShorty
9dfcab2ede [FIX] fixed share information update if shares are 0 2014-03-13 09:12:37 +01:00
Sebastian Grewe
45851ea654 [FEATURE] Added Pool Bonus for Prop and PPLNS 2014-03-13 07:43:45 +01:00
jamieede
0b765417f2 The hacky way simplified. Removed variable 2014-03-12 17:20:22 +00:00
jamieede
790617dd11 Cryptorush API Price Ticker 
Simple yet effective way to get ticker cron to use the Cryptorush.in API
via get=all parameter.

Just enter on your global cfg file:
$config['price']['url'] = 'https://cryptorush.in';
$config['price']['target'] =
'/api.php?get=all&key=YOUR_API_KEY&id=YOUR_USER_ID';
$config['price']['currency'] = 'COIN';

and run the cron. Enjoy!
 2014-03-12 16:48:31 +00:00
iAmShorty
ac9b65e2a7 [FIX] adding recaptcha to login 2014-03-12 17:13:06 +01:00
iAmShorty
654dcc3010 [FIX] making round stats responsive - prop 2014-03-12 14:40:56 +01:00
iAmShorty
90fe68625a [FIX] making round stats responsive 2014-03-12 14:40:05 +01:00
iAmShorty
b3009012a0 [FIX] fixed divs in transactions 2014-03-12 13:22:22 +01:00
iAmShorty
3f028a2fdb [UPDATE] cleaned up about page 2014-03-12 13:09:03 +01:00
iAmShorty
f0ca66376a [FIX] css folders 2014-03-12 12:56:33 +01:00
nrpatten
b3eb25c8d4 [FIX] text-center QRcode 2014-03-12 04:13:26 -07:00
Sebastian Grewe
3a73ef54ae [FIX] Remove static table reference 2014-03-12 11:53:12 +01:00
iAmShorty
19697443f5 [FIX] typo in config 2014-03-12 11:43:32 +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
iAmShorty
a431c0fc60 [UPDATE] fixed worker page icons and paging 2014-03-12 09:33:48 +01:00
Sebastian Grewe
846165d512 Merge branch 'development' into bootstrap 2014-03-11 21:55:24 +01:00
Sebastian Grewe
adc7f9f2d6 Merge pull request #1926 from MPOS/settings-class-cache 
[ADDED] Settings Runtime Cache
 2014-03-11 21:54:52 +01:00
Sebastian Grewe
b8ebbe5be2 [FIX] Use proper personal invalid shares 2014-03-11 21:51:11 +01:00
Sebastian Grewe
5a746bb07d [FIX] Hide worker information if live dashboard disabled 2014-03-11 21:48:56 +01:00
Sebastian Grewe
4a79ed8635 [FIX] Initial static values for round shares 2014-03-11 21:44:58 +01:00
Sebastian Grewe
74d4eba27d [CLEANUP] Admin Checks 
* [REMOVED] SQL Checks, those won't be done since we need SQL to
  login as admin anyway. Are handled in database.inc.php too.
* [CHANGE] Dropped *nix detection since it would not detect Linux PHP_OS
* [IMPROVED] Simply check if we can use socket_create at all, fall back
  to fsockopen if this does not exist.

Not addressing any specific issue, just some cleanup.
 2014-03-11 20:32:09 +01:00
iAmShorty
dbc4b70d8b [UPDATE] adding colors to progressbars 2014-03-11 15:38:21 +01:00
nrpatten
083b1f51bf [UPDATE] progress bars and Est Next Difficulty split for props 2014-03-11 06:48:04 -07:00
nrpatten
d1442fea7f Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-11 06:38:29 -07:00
nrpatten
3c41f0b077 [UPDATE] progress bars and Est Next Difficulty split 2014-03-11 06:37:38 -07:00
iAmShorty
59d9c83934 [FIX] show estimated coins if coinprice is disabled 2014-03-11 13:25:45 +01:00
iAmShorty
686e7f17d1 [UPDATE] morris.js charts 2014-03-11 13:18:21 +01:00
iAmShorty
02dc7195c3 [UPDATE] dashboard style 2014-03-11 12:59:17 +01:00
Sebastian Grewe
65ce8f157e Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-11 12:50:54 +01:00
Sebastian Grewe
b05d626abb [CLEANUP] Bar graphs design 2014-03-11 12:50:43 +01:00
iAmShorty
26d52b62c6 [UPDATE] dashboard style 2014-03-11 12:47:30 +01:00
iAmShorty
5a5a5b49c3 [UPDATE] change dashboard as requested 2014-03-11 12:26:32 +01:00
Sebastian Grewe
9eeb2b879c [ADDED] Settings Runtime Cache 2014-03-11 10:54:33 +01:00
iAmShorty
7f012446f0 [UPDATE] smaller table footers 2014-03-11 10:52:41 +01:00
Sebastian Grewe
c3d69fe1ce [ADDED] Worker Information Box to dashboard 2014-03-11 10:18:02 +01:00
Sebastian Grewe
e86f6703e3 [CLONE] Copied prop dashboard to PPLNS for @iAmShorty to play with 2014-03-11 09:37:00 +01:00
Sebastian Grewe
32054045fb Merge branch 'development' into bootstrap 2014-03-11 09:33:03 +01:00
Sebastian Grewe
fbf8036d72 [CLEANUP] Major structure overhaul for dashboard 2014-03-11 09:32:28 +01:00
Sebastian Grewe
a54ba1ea99 [FIX] Initial hashrate value for graph 2014-03-11 09:07:09 +01:00