Sebastian Grewe
90d0ff1081
Merge pull request #1546 from ahmedbodi/patch-1
...
Get Cronjob Status API
2014-01-23 23:13:42 -08:00
Sebastian Grewe
f75200ce1e
Merge pull request #1560 from raistlinthewiz/next
...
Added reward_type and reward info to api/getpoolinfo
2014-01-23 23:09:06 -08:00
Sebastian Grewe
abb0665bd2
Merge pull request #1559 from Neozonz/issue-1558
...
[FIX/ENHANCE] Session management
2014-01-23 23:07:54 -08:00
Neozonz
2d607cca97
[FIX/ENHANCE] Session management
...
@herrkauwer appreciate the code review and help
@xisi initial code pr
@add1ct3dd reporting the issue
2014-01-23 16:52:29 -08:00
Hüseyin Uslu
b518ce0799
Tiny update.
2014-01-24 00:38:28 +02:00
Hüseyin Uslu
0639af54b3
Added reward_type and reward info to api/getpoolinfo
2014-01-24 00:37:50 +02:00
ahmedbodi
6d7d3f2026
Update getcronjobstatus.inc.php
2014-01-23 20:23:41 +00:00
Sebastian Grewe
207a8719fd
Merge pull request #1558 from xisi/security-invalidsession-fix
...
[FIX] Invalid session regeneration
2014-01-23 11:52:00 -08:00
xisi
bb24b9cb2c
Wrong spot
2014-01-23 14:45:11 -05:00
Joey
8b59e3d519
Merge pull request #1557 from xisi/security-invalidsession-fix
...
[FIX] Invalid session regeneration
2014-01-23 11:43:29 -08:00
Sebastian Grewe
d66296cdee
Merge pull request #1555 from cutnpaster/next
...
Lint on cronjobs/pplns_payout.php #1554
2014-01-23 11:41:53 -08:00
xisi
4df4957ec5
Fixes invalid session bug
2014-01-23 14:32:28 -05:00
cut
5705774dfb
Lint on cronjobs/pplns_payout.php #1554
2014-01-23 12:11:18 -06:00
Sebastian Grewe
693edccb18
Merge pull request #1536 from rog1121/patch-1
...
Add Block ID to logging
2014-01-23 08:32:45 -08:00
Sebastian Grewe
33cfa5667d
Merge branch 'next' of github.com:MPOS/php-mpos into next
2014-01-23 16:59:46 +01:00
Sebastian Grewe
92e7f3e1e4
[FIX] Return floats for some statistics
...
Fixes #1540
2014-01-23 16:59:12 +01:00
Sebastian Grewe
fc67e0eb3d
Merge pull request #1548 from vekexasia/patch-2
...
Lets always use $this->table instead of hardcoding
2014-01-23 07:54:41 -08:00
Andrea Baccega
d6670508f7
Lets always use $this->table instead of hardcoding
2014-01-23 12:56:19 +01:00
ahmedbodi
ece8b3adf6
Create getcronjobstatus.inc.php
2014-01-23 10:29:01 +00:00
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
rog1121
9a23148adb
Update pplns_payout.php
2014-01-22 09:24:22 -07:00
rog1121
21888a8153
Update pplns_payout.php
2014-01-22 09:05:21 -07: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
