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

2858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Grewe
6fd55536fa [FIX] Removed method call on PPS globals 2014-03-02 16:26:31 +01:00
Sebastian Grewe
58807e580b [FIX] PHP Notice on Admin Settings page 2014-03-02 12:33:40 +01:00
Sebastian Grewe
e8a72c877c Update README.md 2014-03-02 11:44:37 +01:00
rog1121
639d4ccb10 Fix Notifications Class 2014-03-01 17:00:51 -07:00
Sebastian Grewe
0b2aecbad9 Merge branch 'master' into development 2014-03-01 19:00:11 +01:00
Sebastian Grewe
735bdadd88 [FIX] Payout notification type in list 2014-03-01 13:50:03 +01:00
Sebastian Grewe
3070966c60 Merge pull request #1863 from Contex/master 
Fixed table cells for general_stats.tpl
 2014-02-28 21:20:24 +01:00
Contex
4d2606bedc Fixed table cells for general_stats.tpl 
<th></td> is obviously wrong
 2014-02-28 21:09:28 +01:00
iAmShorty
ddcc8df067 [UPDATE] site specific files 2014-02-28 12:00:11 +01:00
Sebastian Grewe
5f3c44aa8a Merge pull request #1858 from MPOS/findblock-bailout 
[FIX] Bail findblocks on block insertion errors
 2014-02-28 09:10:08 +01:00
Sebastian Grewe
aac80502e1 [FIX] Bail findblocks on block insertion errors 
Fixes #1857 once merged.
 2014-02-28 09:09:29 +01:00
Sebastian Grewe
e1b5ceb77a Merge pull request #1856 from MPOS/development 
Dev to Master
 2014-02-27 22:36:58 +01:00
Sebastian Grewe
2ae2718da1 Merge pull request #1855 from MPOS/PPLNS-backpay 
[UPDATE] Enable PPLNS Backpay by default
 2014-02-27 22:36:31 +01:00
Sebastian Grewe
12b80856c4 [UPDATE] Enable PPLNS Backpay by default 2014-02-27 22:34:47 +01:00
Sebastian Grewe
a44e45f39b Merge pull request #1850 from MPOS/txfee-createdebit 
Txfee createdebit
 2014-02-27 15:22:09 +01:00
Sebastian Grewe
8d369d5ba4 [IMPROVED] Deduct TXFEE in Transaction CreateDebit 
No need to deduct the fees on our cronjob, do it automatically in our
transaction class when creating a Debit record.
 2014-02-27 15:19:01 +01:00
Sebastian Grewe
15d448e47e [FIX] Apply proper fee on auto-payouts 
Thanks IRC blonkel for the heads up.
 2014-02-27 15:19:01 +01:00
Sebastian Grewe
5966f77e76 [ADDED] Hashrate modifier name and value 
* [ADDED] Hashrate modifier value to getnavbardata
* [ADDED] Hashrate modifier name to getnavbardata

Fixes #1845 once merged.
 2014-02-27 15:19:00 +01:00
Sebastian Grewe
576f191065 [IMPROVED] Deduct TXFEE in Transaction CreateDebit 
No need to deduct the fees on our cronjob, do it automatically in our
transaction class when creating a Debit record.
 2014-02-27 15:16:28 +01:00
Sebastian Grewe
0d297309ce [FIX] Apply proper fee on auto-payouts 
Thanks IRC blonkel for the heads up.
 2014-02-27 15:06:17 +01:00
Sebastian Grewe
52b8ecca89 Merge pull request #1849 from MPOS/ctoken-missing 
[FIX] Do not use CTOKEN if CSRF disabled
 2014-02-27 12:38:09 +01:00
Sebastian Grewe
a56df7a50f [ADDED] Hashrate modifier name and value 
* [ADDED] Hashrate modifier value to getnavbardata
* [ADDED] Hashrate modifier name to getnavbardata

Fixes #1845 once merged.
 2014-02-27 12:13:56 +01:00
Sebastian Grewe
9ad568a1d1 [FIX] Do not use CTOKEN if CSRF disabled 
* [FIX] Workers page not checking for CTOKEN properly

Fixes #1848 once merged.
 2014-02-27 11:56:46 +01:00
Sebastian Grewe
37b7a3c8e0 Merge pull request #1847 from MPOS/contactform-recaptcha-disabled 
[FIX] No captcha on contactform if disabled
 2014-02-27 11:41:09 +01:00
Sebastian Grewe
d857a3d85e [FIX] No captcha on contactform if disabled 
Fixes #1846 once merged
 2014-02-27 11:07:37 +01:00
Sebastian Grewe
9e0d1493a6 Merge pull request #1839 from iAmShorty/another-contrib-donors-fix 
[FIX] added >= to values
 2014-02-26 11:20:41 +01:00
iAmShorty
6fb8f835ed [FIX] added >= to values 2014-02-26 11:18:59 +01:00
iAmShorty
cb49ed8072 Merge pull request #1838 from MPOS/contrib-share-donors-fix 
Contrib share donors fix
 2014-02-26 11:04:29 +01:00
Sebastian Grewe
bcc45e22cf [FIX] Same fix for hashrate list 
Formatting updated
 2014-02-26 10:47:10 +01:00
Sebastian Grewe
6df2010b53 [FIX] Donor icons out of order 2014-02-26 10:42:45 +01:00
Sebastian Grewe
bbba9d1daf Merge pull request #1837 from MPOS/unified-user-miningstats 
Unified user miningstats
 2014-02-26 09:53:41 +01:00
Sebastian Grewe
3e64dd3487 Merge pull request #1798 from MPOS/x-forwarded-for-check 
[CHANGED] Parse X-FORWARDED-FOR when supplied
 2014-02-26 09:53:29 +01:00
Sebastian Grewe
858c2cb24c Merge pull request #1826 from iAmShorty/PoS-Balance-Fix 
[FIX] Newmint Payout Fix
 2014-02-26 09:53:17 +01:00
Sebastian Grewe
9955b1ec5c Merge pull request #1829 from iAmShorty/donor-icons 
[UPDATE] nicer donor icons
 2014-02-26 09:53:03 +01:00
Sebastian Grewe
d750e81b02 [FIX] Wait for global cache data, don't run queries 2014-02-26 09:42:49 +01:00
iAmShorty
20374a1eac [UPDATE] changed template 2014-02-26 09:35:50 +01:00
Sebastian Grewe
78619c1427 [IMPROVED] Unified user speed statistics 
* [ADDED] getUserMiningStats to fetch all speed related data
 * Uses global cache if available, falls back to local query and then
   local caches
* [REMOVED] getUserHashrate, getUserSharerate, getUserAvgShareDifficulty
* [UPDATED] All code occurences for the above to use the new system

Probably won't change much since global cache was already used but does
help on the Dashboard since we combine at least 2 calls into one.
 2014-02-26 09:27:32 +01:00
Sebastian Grewe
d82ff63006 Merge pull request #1833 from iAmShorty/getting-started-update 
[UPDATE] added Asteroids MacOS Miner
 2014-02-25 12:53:24 +01:00
iAmShorty
9ae66915c8 [UPDATE] added Asteroids MacOS Miner 2014-02-25 12:49:57 +01:00
iAmShorty
54652cb93f [FIX] added default values 2014-02-25 09:29:09 +01:00
iAmShorty
c39db3bec3 [UPDATE] changed icons 2014-02-25 09:10:06 +01:00
iAmShorty
a52909d909 [UPDATE] changed icons 2014-02-25 08:53:12 +01:00
iAmShorty
67ca76279d [UPDAT] added footer, cleanup 2014-02-24 22:48:57 +01:00
iAmShorty
3381b0e60a [FIX] Typo 2014-02-24 21:24:03 +01:00
iAmShorty
8b3d5ec138 [UPDATE] nicer donor icons 2014-02-24 21:16:15 +01:00
iAmShorty
15f7300195 [UPDATE] cleanup 2014-02-24 20:49:07 +01:00
iAmShorty
c6b060dbd5 [FIX] Newmint Payout Fix 2014-02-24 20:31:53 +01:00
Sebastian Grewe
b8f9aa05f7 Update README.md 2014-02-24 17:06:18 +01:00
Sebastian Grewe
19b8d82824 Update README.md 2014-02-24 17:05:43 +01:00
Sebastian Grewe
b2f555a83a Merge pull request #1820 from iAmShorty/users-registered 
[UPDATE] Adding registrations and Regdate to Admin Dashboard and Userinfo
 2014-02-24 15:02:55 +01:00