Sebastian Grewe
c1d08895cf
Merge pull request #1355 from TheSerapher/issue-1354
...
[CLEANUP] Dashboard number formatting
2014-01-11 04:11:49 -08:00
Sebastian Grewe
5f942d9ba7
[CLEANUP] Dashboard number formatting
...
Cleans up some Ajax data on the dashboard to match the static template
data format. No more jumpy numbers.
Fixes #1354
2014-01-11 13:10:44 +01:00
Sebastian Grewe
23c6ffe7a3
Merge pull request #1353 from TheSerapher/issue-1352
...
[UPDATE] Added active workers to admin dashboard
2014-01-11 03:39:15 -08:00
Sebastian Grewe
6baad2dd06
[UPDATE] Added active workers to admin dashboard
...
* Using lower time range for shares: 120 seconds
* Updated worker class with new time range for active workers
* Added statistics, active users call with 120 seconds time range
* Updated admin panel dashboard template
Fixes #1352 once merged.
2014-01-11 12:37:39 +01:00
Sebastian Grewe
88c962266f
[IMPROVED] Wrapper for contributor stats
...
Fixes a small alignment issue with unbalance table heights.
2014-01-11 12:04:48 +01:00
Sebastian Grewe
41defc88fa
Merge pull request #1338 from cpo/next
...
issue-1336
2014-01-10 23:17:31 -08:00
Sebastian Grewe
07cc791d83
Merge pull request #1350 from rog1121/next
...
Add Custom Stratum URL
2014-01-10 22:21:10 -08:00
Sebastian Grewe
a5c6b73b1a
Merge pull request #1349 from daygle/patch-5
...
Update global.inc.dist.php
2014-01-10 22:19:58 -08:00
Sebastian Grewe
c6700feb1a
Merge pull request #1347 from jessecollier/next
...
Adding drillbit pool
2014-01-10 22:19:36 -08:00
rog1121
412807b7a8
Add Stratum URL
2014-01-10 18:40:06 -07:00
Glen
bbb82ccd69
Update global.inc.dist.php
...
Just thought I would fix a couple of spelling errors for next global.inc.dist.php release :)
2014-01-11 10:49:59 +11:00
Jesse Collier
24ca7aec04
Adding drillbit pool
2014-01-10 13:55:45 -08:00
Sebastian Grewe
af15e45632
Merge pull request #1346 from TheSerapher/issue-1341
...
[FIX] No filter on admin news pages
2014-01-10 11:00:32 -08:00
Sebastian Grewe
7a1a917af0
[FIX] No filter on admin news pages
2014-01-10 20:00:09 +01:00
Sebastian Grewe
aa716c274c
Merge pull request #1342 from TheSerapher/issue-1315
...
Issue 1315
2014-01-10 10:38:01 -08:00
Sebastian Grewe
bd15cee315
Merge pull request #1344 from TheSerapher/issue-1341
...
[FIX] News formatting
2014-01-10 10:37:39 -08:00
Sebastian Grewe
67b2ce6bff
[FIX] News formatting
2014-01-10 19:23:38 +01:00
Sebastian Grewe
9fbc36f9ac
[FIX] Re-added simple error to jsonRPC
2014-01-10 17:08:11 +01:00
Sebastian Grewe
b778429fbf
Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next
2014-01-10 17:01:07 +01:00
Sebastian Grewe
43bd1beeb8
[FIX] Surpress any URL info
2014-01-10 17:00:58 +01:00
Sebastian Grewe
381c7de330
Update README.md
...
Added BTC address for easier donations for altcoins.
2014-01-10 16:52:06 +01:00
Sebastian Grewe
6aefea6b6f
[FIX] Better error handling
2014-01-10 16:41:05 +01:00
Sebastian Grewe
187721f48c
[FIX] Catch new jsonRPC exception
2014-01-10 16:34:37 +01:00
Sebastian Grewe
ead36cfd07
[FIX] End cronjob too
2014-01-10 16:34:37 +01:00
Sebastian Grewe
c29bda4e5d
[FIX] Config option detection
2014-01-10 16:34:37 +01:00
Sebastian Grewe
07b90dbc58
[FIX] Config option detection
2014-01-10 16:34:36 +01:00
Sebastian Grewe
0b43c66e67
[CLEANUP] Removed newline
2014-01-10 16:34:36 +01:00
Sebastian Grewe
90a8404bab
[CLEANUP] Code cleanup, error checking
...
Fixes #1315 once merged.
2014-01-10 16:34:36 +01:00
myrinx
fca7bd7b3d
Update global.inc.dist.php
...
removed wallet address :)
2014-01-10 16:34:36 +01:00
myrinx
75f35d80b1
Update liquid_payout.php
...
formatting
2014-01-10 16:34:36 +01:00
myrinx
be77b05b12
Update global.inc.dist.php
...
added config variabled for the liquid_payout.php cronjob
2014-01-10 16:34:36 +01:00
myrinx
a37ebd2db8
Update version.inc.php
...
changed config to 0.0.2 to support liquid_payout.php cron
2014-01-10 16:34:36 +01:00
myrinx
9f69a0b9f7
Update run-payout.sh
...
added liquid_payout.php
2014-01-10 16:34:36 +01:00
myrinx
26d138a637
Update run-crons.sh
...
added liquid_payout.php
2014-01-10 16:34:35 +01:00
myrinx
640c6a4426
Create liquid_payout.php
...
Add support for a cronjob to send liquid assets.
Maintains a set reserve and sends only when a wallet address is set; and the threshold is set in the config.
2014-01-10 16:34:35 +01:00
Sebastian Grewe
7816078759
Merge pull request #1340 from TheSerapher/issue-1339
...
[FIX] Catch jsonRPC exceptions
2014-01-10 07:23:57 -08:00
Sebastian Grewe
627b7a17ff
[FIX] Catch jsonRPC exceptions
...
Fixes #1339 once merged.
2014-01-10 16:20:24 +01:00
Chris Polderman
5981489925
issue-1336
2014-01-10 14:15:41 +01:00
Sebastian Grewe
2ae3357b23
Merge pull request #1335 from TheSerapher/issue-1334
...
[IMPROVE] Enable SSL on recaptcha_get_html
2014-01-10 02:07:08 -08:00
Sebastian Grewe
10dbcd471d
[IMPROVE] Enable SSL on recaptcha_get_html
...
Fixes #1334 once merged.
2014-01-10 11:00:00 +01:00
Sebastian Grewe
d16b5a1067
Merge pull request #1327 from rog1121/next
...
Add CLEditor to News
2014-01-10 00:27:54 -08:00
Sebastian Grewe
3391b018cb
Merge pull request #1331 from TheSerapher/issue-1329
...
Issue 1329
2014-01-10 00:23:16 -08:00
Sebastian Grewe
8498692f2b
[FIX] Properly un-escape Google Analytics code
2014-01-10 09:15:08 +01:00
Sebastian Grewe
691fa28cc0
Update master.tpl
...
Fixed analytical code position.
2014-01-10 07:53:36 +01:00
Sebastian Grewe
0a0d4dd958
Merge pull request #1326 from himikk/patch-1
...
Update POOLS.md
2014-01-09 22:23:39 -08:00
Sebastian Grewe
19094e73e3
Merge pull request #1271 from drainx/next
...
JSON-RPC
2014-01-09 22:11:35 -08:00
Sebastian Grewe
c16945d564
Merge pull request #1313 from TheSerapher/issue-1233
...
[IMPROVED] Auto-escape all used smarty variables
2014-01-09 22:11:12 -08:00
Sebastian Grewe
8e356d1eaf
Merge pull request #1311 from TheSerapher/issue-1281
...
[FIX] Number formatting on pages
2014-01-09 22:10:22 -08:00
Sebastian Grewe
e122addbc8
Update README.md
2014-01-10 07:02:17 +01:00
Sebastian Grewe
56702009d5
Merge pull request #1323 from daygle/patch-4
...
Update default.tpl
2014-01-09 21:53:24 -08:00
