Sebastian Grewe
7e49e90996
[Merge] Fix conflicts with development
2014-03-07 08:37:51 +01:00
Sebastian Grewe
581f365628
[FIX] Removed +x bit
2014-03-07 08:24:34 +01:00
Sebastian Grewe
c3ad49aab2
[FIX] Remove +x bits
2014-03-06 18:40:57 +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
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
Sebastian Grewe
5fc516f6b9
Merge pull request #1890 from mxaddict/master
...
Pull request for findblock cron fix, related to orphaned blocks.
2014-03-06 09:43:05 +01:00
iAmShorty
2f1f70f54e
[FIX] delete whitespaces in api keys
2014-03-05 21:11:29 +01:00
Sebastian Grewe
59aef1d1e3
Merge branch 'development' into bootstrap
2014-03-04 10:41:37 +01:00
iAmShorty
57e6b2dd8c
[FIX] permission fix
2014-03-03 17:34:53 +01:00
iAmShorty
887eef3f37
[FIX] fixed typo in notification class
2014-03-03 17:34:09 +01:00
iAmShorty
1960df0d91
[UPDATE] updated query and template
2014-03-03 16:59:06 +01:00
iAmShorty
84b62aedbd
[FEATURE] timeframed earning stats
2014-03-03 15:43:23 +01:00
iAmShorty
ec06339867
[FIX] another hashrate calc error
2014-03-03 11:42:03 +01:00
Sebastian Grewe
b59f878c22
[MERGE] Development, merge conflicts fixed
2014-03-03 10:50:58 +01:00
iAmShorty
f891743aed
[FIX] fixed calculation
2014-03-03 08:50:12 +01:00
iAmShorty
863dbb56eb
[FIX] fixed nethashrate for some coins
2014-03-03 08:41:44 +01:00
iAmShorty
6705f879b1
[UPDATE] total user earnings, icons in invitations
2014-03-02 17:36:21 +01:00
Barry Deeney
7dce981901
Added the getLastValid function for findblock cron
2014-03-02 11:02:28 +08:00
rog1121
93981f6044
Various Fixes
2014-03-01 17:57:43 -07:00
rog1121
7e3623d659
Various Fixes
2014-03-01 17:56:23 -07:00
rog1121
639d4ccb10
Fix Notifications Class
2014-03-01 17:00:51 -07:00
iAmShorty
8f4c5cc570
[UPDATE] added notifications to header
2014-03-01 12:37:53 +01:00
Sebastian Grewe
dcdc22b15b
[ADDED] Missing comment
2014-02-28 09:20:07 +01:00
Sebastian Grewe
9969352056
[FIX] Potential regression
2014-02-28 09:18:38 +01:00
iAmShorty
549d4dd749
[BOOTSTRAP] basic implementation
2014-02-27 17:45:48 +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
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
d750e81b02
[FIX] Wait for global cache data, don't run queries
2014-02-26 09:42:49 +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
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
Sebastian Grewe
dc1fe9aa35
Merge pull request #1799 from MPOS/debug-to-logfile
...
[IMPROVED] Allow debug console log to logfile
2014-02-24 11:26:43 +01:00
iAmShorty
55266e274a
[UPDATE] added pagination to reg and invite
2014-02-24 11:24:13 +01:00
iAmShorty
0f9cdb915c
[UPDATE] fixed typo in sql queries
2014-02-24 10:58:23 +01:00
iAmShorty
d419b1f0ff
[UPDATE] sorting by count
2014-02-24 10:56:47 +01:00
iAmShorty
37b8d5a56b
[UPDATE] changed hardcoded table names
2014-02-24 10:52:12 +01:00
iAmShorty
fbdd811d7f
[UPDATE] added top inviter, some code cleanup
2014-02-24 10:39:09 +01:00
iAmShorty
d0a82be11b
[UPDATE] adding if user was invited and inviter to registered users
2014-02-23 22:30:52 +01:00
iAmShorty
23afae0aaf
[UPDATE] added last 10 registered users to dashboard
2014-02-23 21:35:20 +01:00
iAmShorty
c5ff564deb
[FIX] Wallet Balance
2014-02-20 20:59:54 +01:00
Sebastian Grewe
865cd96f5e
[IMPROVED] Allow debug console log to logfile
...
* Needs logging level set to 7 in security config
* Needs debugging enabled in global config
2014-02-20 09:01:18 +01:00
Sebastian Grewe
8bd469ba5d
[CHANGED] Parse X-FORWARDED-FOR when supplied
...
Instead of trusting REMOTE_ADDR we should parse X-FORWARDED-FOR if
supplied. This will properly use the user IP in a multi-LB setup.
Needs testing
2014-02-19 14:32:20 +01:00
Sebastian Grewe
8cb42aab2b
Merge pull request #1770 from iAmShorty/realbalance-wrapper
...
[FIX] return balance from main account
2014-02-19 09:34:01 +01:00
Sebastian Grewe
7229b5b130
[ADDED] Payout Queue Limiter
...
* [ADDED] LIMIT to getMPQueue and getAPQueue
* [ADDED] Default config payout queue size of 1000 for MP and 1000 for AP
* [UPDATED] Payouts cronjob to use this new default limits
This may help some coins that have tx count issues when doing sendmany.
Other coins can play with the values to find their sweet spot. Run the
payout multiple times in a row to force more transactions of the same
amount.
Fixes #1773 and thanks to @jrwr for the idea!
2014-02-18 09:16:26 +01:00
iAmShorty
d2be015554
[FIX] return balance from main account
2014-02-16 16:44:36 +01:00
Sebastian Grewe
cdaf757b8b
Merge branch 'next' of github.com:MPOS/php-mpos into next
2014-02-16 08:32:10 +01:00
Sebastian Grewe
6f5d866bb9
[ADDED] Force run even if cron is active with -f
2014-02-16 08:31:47 +01:00
Sebastian Grewe
d1f3f5d01d
[UPDATE] Return negative balance if main is negative
2014-02-15 19:17:12 +01:00
