Commit Graph

2407 Commits

Author SHA1 Message Date
Sebastian Grewe
6b52d47ab2 Merge pull request #1545 from Neozonz/issue-1489
[FIX] getUserID -> getUserIdbyEmail
2014-01-23 01:16:16 -08:00
Sebastian Grewe
7acd3bc821 Merge pull request #1543 from Neozonz/issue-1542
[BUG] FIX txfee in getpoolinfo API
2014-01-23 01:13:00 -08:00
Sebastian Grewe
4b04df5d8a [FIX] Allow TAB to focus on email login 2014-01-23 10:11:37 +01:00
Sebastian Grewe
8a53e0319d [FIX] Missed file for admin maintenance 2014-01-23 10:01:35 +01:00
Neozonz
d75ee58d94 [FIX] getUserID -> getUserIdbyEmail
If I understand correctly... Email is stored in $username.
2014-01-23 03:25:01 -05:00
Sebastian Grewe
9828458963 Merge pull request #1544 from MPOS/maintenance-mode-admin
[FIX] Allow admin logins in maintenance mode
2014-01-22 23:58:56 -08:00
Sebastian Grewe
ac1bc4b2ce [FIX] Allow admin logins in maintenance mode
Fixes #1489
2014-01-23 08:58:25 +01:00
Neozonz
7a21b05a3d [BUG] Fix txfee API call with added support for old API calls
[ADD] txfee_auto to API Calls
[ADD] txfee_manual to API Calls
[ADD] confirmations to API Calls
2014-01-23 02:38:34 -05:00
Sebastian Grewe
cde6227692 Merge pull request #1539 from fspijkerman/next
Use a full path instead of CWD set by PHP
2014-01-22 22:17:24 -08:00
Frank Spijkerman
0d300581ff Use a full path instead of CWD set by PHP 2014-01-22 18:40:06 +01:00
Sebastian Grewe
be19318e26 Merge pull request #1534 from freynder/next
Bugfix: shares and shares_archive values should be added up.
2014-01-22 05:38:06 -08:00
freynder
952d5d979c Bugfix: shares and shares_archive values should be added up. 2014-01-22 14:18:38 +01:00
Sebastian Grewe
2a661b5e78 [FIX] Return proper data if memcache disabled
If memcache option is disabled, the functions should return the data we
tried to set instead of false. At least we can ensure data is returned
as expected from any methods trying to use the memcache.
2014-01-22 14:02:44 +01:00
Sebastian Grewe
593149742e Merge pull request #1491 from Neozonz/issue-1488
[Optimize] SQL Queries : Remove joins from account table
2014-01-22 04:56:16 -08:00
Neozonz
8b4ad00b1a [FIX] Fixed Data types for getHashrate 2014-01-22 07:33:01 -05:00
Neozonz
3de2fee57f [FIX] Updated function call to include account id as well 2014-01-22 07:10:05 -05:00
Sebastian Grewe
0d10079a2a [FIX] remove mail debug output 2014-01-22 12:48:03 +01:00
Sebastian Grewe
faf648d1d2 [FIX] Show username in Login Mails 2014-01-22 12:18:51 +01:00
Sebastian Grewe
6336ca29ea Merge pull request #1531 from MPOS/missing-login-info-maildata
[FIX] Properly show login details on mail notif.
2014-01-22 02:15:56 -08:00
Sebastian Grewe
3b13ea4990 [FIX] Properly show login details on mail notif.
Fixes #1530 once merged
2014-01-22 11:14:50 +01:00
Sebastian Grewe
a41d395306 Merge pull request #1528 from nathanthorpe/patch-1
Spelling
2014-01-21 22:52:57 -08:00
Sebastian Grewe
a04d451739 Merge pull request #1523 from nonstopmine/patch-3
Update mail.class.php
2014-01-21 22:49:20 -08:00
nathanthorpe
f3a4c8173f Update README.md 2014-01-21 21:21:45 -08:00
Neozonz
0faf23027a [CACHE] Readded 2014-01-21 20:29:09 -05:00
Neozonz
a9853e2832 [Removed] Caching for testing 2014-01-21 20:18:38 -05:00
Neozonz
934825e8dc [FIX] Remove old query remnants 2014-01-21 20:14:44 -05:00
Neozonz
3222792533 [BUG FIX] Missing JSON 2014-01-21 20:14:13 -05:00
Neozonz
be8437e9dd [FIX] Missing User ID argument 2014-01-21 20:07:07 -05:00
Neozonz
f613cc6bfd [FIX] Set interval for sample size as well 2014-01-21 20:06:37 -05:00
Neozonz
2090247afb [COMMENT] Added commenting and fixed function descriptions
[CLEAN] Clean Code
2014-01-21 19:43:33 -05:00
Neozonz
02f085f2d7 [FIX] MySQLi Queries 2014-01-22 00:13:58 +00:00
Nonstopmine.com
ac7aed4bc4 Update mail.class.php
PHP Notice
2014-01-21 22:28:39 +02:00
Neozonz
34dfd4aefb [FIX] SQL Conditional Operator 2014-01-21 11:16:00 -08:00
Sebastian Grewe
971006b7a2 [FIX] Live stats not being done with global cache
Fixes live stats not updating and always using the global cache instead.
2014-01-21 17:16:26 +01:00
Sebastian Grewe
4d07efe61c Merge pull request #1519 from nrpatten/next
[FIX] Align Checkbox
2014-01-21 06:34:38 -08:00
Sebastian Grewe
23aa097672 Merge pull request #1520 from MPOS/pool-hashrate-0
[FIX] Storing/showing wrong data from cache
2014-01-21 06:26:02 -08:00
Sebastian Grewe
0d367697e0 [FIX] Storing/showing wrong data from cache
Fixes #1517
2014-01-21 15:24:44 +01:00
nrpatten
151decb2b6 [FIX] Align Checkbox
"Edit template" checkbox align closer to "Active"
2014-01-22 00:39:42 +11:00
Sebastian Grewe
f793e15f61 Merge pull request #1518 from nrpatten/next
[FIX] Update github footer link
2014-01-21 04:46:37 -08:00
nrpatten
fc7a939b1e [FIX] Update github footer link
Remove https://github.com/TheSerapher/php-mpos
Add https://github.com/MPOS/php-mpos
2014-01-21 23:42:58 +11:00
Sebastian Grewe
af1e6e8e13 Merge pull request #1516 from MPOS/default-payout-block
[UPDATE] Change payout by default to block
2014-01-21 04:15:18 -08:00
Sebastian Grewe
10ba200df6 [UPDATE] Change payout by default to block 2014-01-21 13:14:53 +01:00
Neozonz
1630d85440 [FIX] Cache by Account_ID
[FIX] Query by Username
2014-01-21 06:58:28 -05:00
Sebastian Grewe
2eb53d8efc Merge pull request #1515 from xisi/security-typofix
Typo in registration
2014-01-21 03:56:18 -08:00
xisi
c88a14bac1 typo 2014-01-21 06:51:56 -05:00
Neozonz
0a5344cba0 Merge branch 'github.com/issue-1488'
Conflicts:
	public/include/classes/statistics.class.php
2014-01-21 06:44:10 -05:00
Neozonz
07e8af55f8 [FIX] Added back accound_ids for caching
[FIX] SQL string termination
2014-01-21 06:42:08 -05:00
Neozonz
df97e7a8ea [Optimize] Switched calls to username from id 2014-01-21 06:41:00 -05:00
Neozonz
9e8841b1df [Optimize] Switched calls to username from id 2014-01-21 06:41:00 -05:00
Neozonz
4d845c7c73 [Optimize] Switched calls to username from id 2014-01-21 06:41:00 -05:00