Sebastian Grewe
5c4112d598
Merge branch 'development' into bootstrap
2014-03-19 17:05:38 +01:00
Sebastian Grewe
457e40c24c
[FIX] Cryptorush API fix
2014-03-19 16:44:37 +01:00
iAmShorty
452d468843
[UPDATE] added datatable to user info
2014-03-19 16:09:48 +01:00
iAmShorty
daf0703857
[UPDATE] added mintpal ticker api
2014-03-19 13:27:06 +01:00
Sebastian Grewe
e863ef3a0a
Merge branch 'development' into bootstrap
2014-03-17 15:53:53 +01:00
Boris
bf327a23a9
[FIX] Remove a couple more static table references
2014-03-17 14:49:27 +00:00
Boris
0e61aaa9fe
[FIX] Remove more static table references #1929
2014-03-17 12:55:13 +00: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
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
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
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
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
Sebastian Grewe
9eeb2b879c
[ADDED] Settings Runtime Cache
2014-03-11 10:54:33 +01:00
Sebastian Grewe
32054045fb
Merge branch 'development' into bootstrap
2014-03-11 09:33:03 +01:00
Sebastian Grewe
9941c61449
[FIX] Disable monitor column on admin pool workers
2014-03-11 08:48:34 +01:00
Sebastian Grewe
4f01b277fb
[FIX] Disable monitor option in workers page
2014-03-10 14:20:12 +01:00
Sebastian Grewe
d289b422f3
[ADDED] IDLE Worker Global Switch
...
Fixes #1921 once merged.
2014-03-10 13:40:23 +01:00
Sebastian Grewe
bf1ac16b07
Merge branch 'development' into bootstrap
2014-03-10 13:22:56 +01:00
iAmShorty
7bc6ec9ace
[FIX] mpos compatibility for icons in navigation
2014-03-10 09:36:50 +01:00
iAmShorty
e3317f320c
[FIX] mpos theme notification fix
2014-03-10 09:04:36 +01: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
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
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
rog1121
69e47fe261
Add Ticketupdate 'enabled' var
2014-03-05 16:22:37 -07:00
iAmShorty
2f1f70f54e
[FIX] delete whitespaces in api keys
2014-03-05 21:11:29 +01:00
iAmShorty
7a86b827d5
[FIX] min payout fix, balance not initialized
2014-03-05 18:51:17 +01:00
iAmShorty
b85a47ac50
[UPDATE] dashboard fixes, disable tickerupdate in cron/dashboard
2014-03-05 16:21:23 +01:00
iAmShorty
faf414e669
[FEATURE] added minimum payout
2014-03-05 15:02:16 +01:00
Sebastian Grewe
f72cdf3842
Merge pull request #1891 from iAmShorty/minimum-payout
...
[UPDATE] minimum manual payout
2014-03-05 13:50:43 +01:00
iAmShorty
75945eb5b0
[FIX] added minimum payout to notification message
2014-03-05 13:26:02 +01:00