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

2394 Commits

Author SHA1 Message Date
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
Sebastian Grewe
670432a89b [CLEANUP] Number formatting adjusted in JS 2014-03-11 09:04:44 +01:00
Sebastian Grewe
8831dadbc0 [PREP] #1922 2014-03-11 08:59:22 +01:00
nrpatten
62a9672194 [UPDATE] Add shares per second S/s to My Sharerate 2014-03-11 00:52:24 -07:00
Sebastian Grewe
9941c61449 [FIX] Disable monitor column on admin pool workers 2014-03-11 08:48:34 +01:00
nrpatten
5e076552e4 [UPDATE] Add Difficulty/est Difficulty and Time per Block 2014-03-11 00:45:29 -07:00
nrpatten
ac8223c882 [UPDATE] Remove dashboard round stats color as requested 2014-03-10 19:47:26 -07:00
nrpatten
c7df914225 [UPDATE] Remove dashboard round stats color as requested 2014-03-10 19:45:47 -07:00
iAmShorty
7143845fe4 [FIX] updating workers page 2014-03-10 17:19:56 +01:00
nrpatten
3ef1aa4030 [UPDATE] Overview MH/s size 2014-03-10 09:16:25 -07:00
Sebastian Grewe
1ab765b9a7 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-10 16:56:06 +01:00
Sebastian Grewe
9f97eb664a [CLEANUP] Font in stats boxes 2014-03-10 16:55:56 +01:00
iAmShorty
c53c288d00 [UPDATE] reworked getting started page 2014-03-10 16:12:47 +01:00
Sebastian Grewe
4f01b277fb [FIX] Disable monitor option in workers page 2014-03-10 14:20:12 +01:00
nrpatten
e707548639 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-10 06:09:35 -07:00
nrpatten
bf3029dc3c [UPDATE] Move .hashunits into span next to Hashrate [FIX] For resize 2014-03-10 06:09:03 -07:00
iAmShorty
20df3794b7 [UPDATE] changed bitcoin icon to money 2014-03-10 13:55:30 +01:00
Sebastian Grewe
d289b422f3 [ADDED] IDLE Worker Global Switch 
Fixes #1921 once merged.
 2014-03-10 13:40:23 +01:00
nrpatten
834b8136d9 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-10 05:39:36 -07:00
nrpatten
4ff53d16f6 [UPDATE] Registration Layout 2014-03-10 05:36:31 -07:00
iAmShorty
7977834aa0 [UPDATE] additional spaces request #1920 2014-03-10 13:29:43 +01:00
Sebastian Grewe
bf1ac16b07 Merge branch 'development' into bootstrap 2014-03-10 13:22:56 +01:00
iAmShorty
603961df1e [FIX] added default start var to worker paging 2014-03-10 13:06:41 +01:00
Nathan Patten
e9b6e009d8 [FIX] Open {nocache} 2014-03-10 22:19:07 +11:00
Nathan Patten
f6425ba3fb [ADD] Price enable/disable to currency/day 2014-03-10 22:11:45 +11:00
iAmShorty
4fc9eae9b6 [UPDATE] borderless css for dashboard round stats 2014-03-10 12:07:32 +01:00
iAmShorty
6c195afb42 [UPDATE] removed debugger console 2014-03-10 11:58:49 +01:00
iAmShorty
e4f048be6d [UPDATE] added CTOKEN to forms 2014-03-10 11:52:17 +01:00
Nathan Patten
3ade244b2c [FIX] Remove spark from bootstrap.min.css 2014-03-10 21:49:47 +11:00
Nathan Patten
f16be5db6e [FIX] Remove spark from bootstrap.css 2014-03-10 21:46:56 +11:00
Nathan Patten
cd1c828051 [FIX] Remove spark from bootstrap.css 2014-03-10 21:43:22 +11:00
iAmShorty
03c890bad2 [FIX] changed inline styles to css in overview 2014-03-10 11:15:19 +01:00
iAmShorty
2225468374 [FIX] changed inline styles to css 2014-03-10 11:07:25 +01:00
Nathan Patten
1a9ba4adc3 [FIX] Forgot api id's 2014-03-10 20:50:37 +11:00
Nathan Patten
b845ec664c [FIX] Forgot api id's 2014-03-10 20:49:06 +11:00
iAmShorty
68816e3161 [UPDATE] fixed balance background 2014-03-10 10:28:37 +01:00
Nathan Patten
27670647b6 [FIX] Sparks Line/Bar 2014-03-10 20:27:06 +11:00
Nathan Patten
04c5b4b528 [FIX] Nethashrate 2014-03-10 20:22:17 +11:00
Nathan Patten
0f3c24a293 [FIX] Nethashrate 2014-03-10 20:21:29 +11:00
iAmShorty
022a3d1598 [FIX] Dasboard icon alignment 2014-03-10 10:04:36 +01:00
Sebastian Grewe
cf3e230f32 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-10 09:52:01 +01:00
Sebastian Grewe
baf07e0abc [CLEANUP] Responsive tables added when needed 2014-03-10 09:51:25 +01:00
iAmShorty
7bc6ec9ace [FIX] mpos compatibility for icons in navigation 2014-03-10 09:36:50 +01:00
iAmShorty
6b1bceabdf [FIX] removed test files 2014-03-10 09:05:46 +01:00
iAmShorty
e3317f320c [FIX] mpos theme notification fix 2014-03-10 09:04:36 +01:00
nrpatten
e6088fed2e [FIX][UPDATE] Login Icons/Dashboard Auto Resize (easyer to work with for adding sparks) 2014-03-10 00:07:26 -07:00
nrpatten
afd9fb2aba [UPDATE] Login Icons/Dashboard Auto Resize (easyer to work with for adding sparks) 2014-03-09 23:42:56 -07:00
Sebastian Grewe
0f13bd7c4f Merge pull request #1912 from MPOS/cookie-domain-fix 
[FIX] Changing Cookie Domain
 2014-03-09 20:09:55 +01:00
Sebastian Grewe
6953b8ece8 Merge pull request #1910 from iAmShorty/stratum-poke 
[CHANGE] issue #1905
 2014-03-08 11:15:06 +01:00
iAmShorty
3c33e1b36f [CHANGE] issue #1905 2014-03-08 11:11:09 +01:00
Sebastian Grewe
8651cd38ad [FIX] Changing Cookie Domain 2014-03-08 08:41:00 +01:00
Sebastian Grewe
7c1e9b4072 [ADDED] Dashboard Quick Access on mobile 2014-03-07 09:11:32 +01:00
Sebastian Grewe
942c1ff2a3 [REMOVED] Color Round Stats, not our own style 2014-03-07 09:09:53 +01:00
Sebastian Grewe
ba8e3aa384 [TEST] Min/Max Ranges for Price Ticker 2014-03-07 08:43:03 +01:00
Sebastian Grewe
7e49e90996 [Merge] Fix conflicts with development 2014-03-07 08:37:51 +01:00
Sebastian Grewe
e62db71c04 [FIX] Tickerupdate Checks 2014-03-07 08:36:55 +01:00
Sebastian Grewe
581f365628 [FIX] Removed +x bit 2014-03-07 08:24:34 +01:00
Sebastian Grewe
0b0a26a010 [FIX] Unset POPUPs on disabled API 2014-03-07 07:56:43 +01:00
rog1121
d2ddad53c2 Fix Dashboard Centering 2014-03-06 15:25:40 -07:00
Sebastian Grewe
c3ad49aab2 [FIX] Remove +x bits 2014-03-06 18:40:57 +01:00
iAmShorty
b7db722296 [FIX] removed test from footer 2014-03-06 15:05:29 +01:00
iAmShorty
dcfa79c1c9 [FIX] coin_address is string, not int 2014-03-06 15:04:22 +01:00
iAmShorty
59b7c364fd [FIX] coin_address is string, not int 
throws a mysql error when updating coin address in user settings
 2014-03-06 15:01:27 +01:00
iAmShorty
f9835e671c [FIX] trim whitespaces 2014-03-06 11:49:37 +01:00
iAmShorty
1c41534b17 Merge pull request #1884 from iAmShorty/wallet-balance-newmint-fix 
[FIX] Wallet Balance Newmint Calc Fix
 2014-03-06 11:45:36 +01:00
Sebastian Grewe
eb6454c8fc Merge pull request #1896 from iAmShorty/uptimerobot-trim-whitespaces 
[FIX] delete whitespaces in uptimerobot api keys
 2014-03-06 09:43:14 +01:00