Commit Graph

2076 Commits

Author SHA1 Message Date
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
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
Sebastian Grewe
fcbf153bd9 [FIX] Do not show xaxis ticks
Ticks take too much room and don't convey enough information. They are
now removed.

Fixes #1276 once merged.
2014-01-09 09:16:50 +01:00
Sebastian Grewe
eafb241bde [REMOVED] Support page code 2014-01-09 09:11:33 +01:00
Sebastian Grewe
6e99806479 [REMOVE] Uneeded, useless support page
* Removed support page templates
* Changed navigation to contact
* Modified contact form behaviour on enable/disable events

This fixes #1300. It wasn't clear which templates needed to be edited
for the contact form to work.
2014-01-09 09:09:14 +01:00
Sebastian Grewe
9b0240de3b Merge pull request #1302 from drainx/patch-2
Rename 012_db_version.sql to 011_db_version.sql
2014-01-08 21:49:24 -08:00
poolerMF
6f52609e29 Update POOLS.md
added mem.cryptocomi.com
2014-01-09 00:14:09 +01:00
drainx
779d8cd427 Rename 012_db_version.sql to 011_db_version.sql
Because it could bother someone as to why they are missing update 11.
2014-01-08 16:44:40 -06:00
Sebastian Grewe
87b6efba41 Merge pull request #1294 from myrinx/patch-1
Update POOLS.md
2014-01-08 06:08:09 -08:00
myrinx
631ebbf9e4 Update POOLS.md
Added RonPaulCoin pool http://rpc.pooljunkie.nl
2014-01-08 14:46:16 +01:00
Sebastian Grewe
146cf94a5e [CLEANUP] Registration page 2014-01-08 09:23:42 +01:00
Sebastian Grewe
b3169bc9d8 Merge pull request #1284 from vekexasia/patch-1
Fixed documentation typos.
2014-01-07 07:04:54 -08:00
Andrea Baccega
7fd258fab4 Fixed documentation typos. 2014-01-07 15:56:47 +01:00
Sebastian Grewe
937bf56c18 Merge pull request #1279 from raistlinthewiz/next
Updated max lenght of username field in password-reset form
2014-01-07 04:13:11 -08:00
Hüseyin Uslu
b69991e129 Increased password-reset form username size to 100
Increased the accepted max-length to 100 as requested:  https://github.com/TheSerapher/php-mpos/pull/1279#issuecomment-31732351
2014-01-07 14:11:26 +02:00
Hüseyin Uslu
748e4796c1 Updated max lenght of username field in password-reset form
As the password reset form can also accept emails, increased the max-length size to 50 - so that we can accept long emails too.
2014-01-07 14:04:21 +02:00
Sebastian Grewe
1148ac5c5f Merge pull request #1278 from TheSerapher/issue-1277
[ADDED] User overview in admin dashboard
2014-01-07 01:33:29 -08:00
Sebastian Grewe
549477a7ad [ADDED] User overview in admin dashboard
* Total users
* Locked users
* Admin users
* No Fees users

Thanks @daygle for the suggestion!

Fixes #1277 once merged
2014-01-07 10:32:34 +01:00
Sebastian Grewe
777a367feb [ADDED] Mark locked accounts during validation 2014-01-07 09:53:26 +01:00
Sebastian Grewe
bbdf3a8bb2 [FIX] RPC exception on empty address 2014-01-07 09:46:42 +01:00
Sebastian Grewe
8ddffac34a Merge pull request #1275 from TheSerapher/issue-1177
Issue 1177
2014-01-07 00:43:48 -08:00