Commit Graph

2095 Commits

Author SHA1 Message Date
rog1121
412807b7a8 Add Stratum URL 2014-01-10 18:40:06 -07: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
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
rog1121
8e06c41a90 CLEditor 2014-01-09 21:13:47 -07:00
himikk
4ebcc840bd Update POOLS.md 2014-01-10 09:37:08 +06:00
Glen
748a3d48c3 Update default.tpl
Suggestion to remove 'account' column from user 'transactions' page to allow more real estate on the page.

The 'account' really is a waste of space anyway for the user view on the other hand the transactions in the Admin panel the account column is useful.
2014-01-10 13:17:45 +11:00
Sebastian Grewe
203fb91ecb Merge pull request #1303 from poolerMF/patch-1
Update POOLS.md
2014-01-09 10:45:56 -08:00
Sebastian Grewe
b12a45ed2a Merge pull request #1306 from TheSerapher/issue-1300
Issue 1300
2014-01-09 08:41:30 -08:00
Sebastian Grewe
a2a6f36c1f [IMPROVED] Auto-escape all used smarty variables
http://www.smarty.net/docs/en/variable.escape.html.tpl

Addresses #1233
2014-01-09 11:10:47 +01:00
Sebastian Grewe
02cd098099 [FIX] #1245 Typo 2014-01-09 11:05:06 +01:00
Sebastian Grewe
3645a23333 Merge pull request #1312 from TheSerapher/issue-1061-deleteuser
[UPDATE] Allow deletion of accounts
2014-01-09 01:33:12 -08:00
Sebastian Grewe
b82e500379 [FIX] Number formatting on pages
* Added new global js library to convert number_format similar to PHP
 * Does some rounding, so not 100% perfect but does the trick
* Added new library to master template
* Updated dashboard to use this library for all numbers in question

Fixes #1276
2014-01-09 10:25:48 +01:00
Sebastian Grewe
cd51fcb4c3 Merge pull request #1309 from daygle/patch-3
Update POOLS.md
2014-01-09 01:16:17 -08:00
Glen
92122e456f Update POOLS.md 2014-01-09 19:58:53 +11:00
Sebastian Grewe
ab1a89e2eb Merge pull request #1307 from TheSerapher/issue-1276
[FIX] Do not show xaxis ticks
2014-01-09 00:18:19 -08:00