RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,107 Commits 4 Branches 11 Tags 14 MiB
c1d08895cf
Commit Graph

924 Commits

Author SHA1 Message Date
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
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
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
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
Sebastian Grewe
aa716c274c Merge pull request #1342 from TheSerapher/issue-1315 
Issue 1315
 2014-01-10 10:38:01 -08:00
Sebastian Grewe
9fbc36f9ac [FIX] Re-added simple error to jsonRPC 2014-01-10 17:08:11 +01:00
Sebastian Grewe
43bd1beeb8 [FIX] Surpress any URL info 2014-01-10 17:00:58 +01:00
Sebastian Grewe
6aefea6b6f [FIX] Better error handling 2014-01-10 16:41:05 +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
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
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
10dbcd471d [IMPROVE] Enable SSL on recaptcha_get_html 
Fixes #1334 once merged.
 2014-01-10 11:00:00 +01: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
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
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
Andrea Baccega
7fd258fab4 Fixed documentation typos. 2014-01-07 15:56:47 +01: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
ef28547940 Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2014-01-07 09:40:02 +01:00
Sebastian Grewe
727b082059 [FIX] Registration password lenght, API class default time 2014-01-07 09:39:43 +01:00
drainx
f7b087df98 Small human error fix. 2014-01-06 18:29:23 -06:00
drainx
5a1c693fa6 Move from XML-RPC to JSON-RPC. 2014-01-06 17:34:54 -06:00
Sebastian Grewe
5ce2662ae5 Merge pull request #1246 from TheSerapher/issue-1242 
[INITIAL] Working version checks
 2014-01-06 08:05:32 -08:00
Sebastian Grewe
cfe47ed787 [FIX] Caching issues with hybrid templates 
* Create subfolders for cache/compiled files for themes

Fixes #1016 once merged.
 2014-01-06 10:52:21 +01:00
Sebastian Grewe
3f1e74e381 [UPSTREAM] Upgraded smarty libraries 
Fixes #1249 once merged.
 2014-01-05 13:41:41 +01:00
Sebastian Grewe
2568ced4d4 [INITIAL] Working version checks 
* Check DB structure version, config file version and MPOS core version
* Added new Admin Dashboard to show this core information
* Cronjobs will be disabled if SQL files are not imported
 * SQL files must re-set the db_upgrade_required setting
* Cronjobs will disabled if config files are not updated
 * Simple config file update and version string update will fix this
* Added MPOS status overview
 * Cronjobs and Wallet information for now, others may be added later
* Added new navigation link for Admin Panel Dashboard
* Added new version file
 * Will require updates whenever DB or configs are updated
* Update SQL file that adds the DB_VERSION setting

This will address #1242 and already includes a huge chunk of changes
required to make this work.
 2014-01-05 11:19:09 +01:00
Sebastian Grewe
8fcd59eeea [ADDED] Account unlock mail on failed PIN 2014-01-02 13:28:33 +01:00
Sebastian Grewe
878fa1c1c8 [IMPROVED] Unlock notification mails on auto-locks 
* Added new token type: account_unlock
* Added update SQL File
* Updated base structure with new token type
* Added empty template
* Updated user class to send mail on failed passwords
* Added unlock account page to use tokens

Addresses #670
 2014-01-02 11:51:22 +01:00
Sebastian Grewe
5c5db8dc93 Merge pull request #1191 from TheSerapher/issue-1181 
Issue 1181
 2014-01-02 02:08:19 -08:00
Sebastian Grewe
e8d460cfe6 [UPDATE] Removed debug echo output 2014-01-02 11:05:49 +01:00
Sebastian Grewe
67a6d9aff4 [UPDATE] Coding style 2014-01-02 11:05:07 +01:00
Sebastian Grewe
4c3421cc8a Merge pull request #1165 from Neozonz/issue-1164 
Initial commit for pin reset functionality
 2014-01-02 02:02:37 -08:00
Sebastian Grewe
dc81ad3123 Merge pull request #1166 from TheSerapher/issue-1159 
Issue 1159
 2014-01-01 02:11:02 -08:00
Sebastian Grewe
e762bb0391 [IMPROVED] Use data interval on getuserworkers 2014-01-01 09:08:09 +01:00
Sebastian Grewe
6656e47fdc [FIX] Spelling error 
Fixes #1192 once merged
 2014-01-01 08:39:49 +01:00
Sebastian Grewe
731985b30f [IMPROVED] Token expiration timers 
* Added new SQL file to update tokentypes table
* Added new function to base class
* Renamed function in base class used in shares class
* Added new error code
* Added new cronjob to delete expired tokens
* Added new cronjob to run-cron scripts and monitoring page
* Added new function to tokentype class
* Added new function to token class

Will address #1181 once merged.
 2013-12-31 22:31:47 +01:00
Sebastian Grewe
82efbb4609 Merge branch 'issue-1185' into next 
Conflicts:
	public/templates/mpos/global/navigation.tpl
 2013-12-31 17:11:03 +01:00
Sebastian Grewe
ee02445b7d Merge branch 'issue-965' into next 
Conflicts:
	public/templates/mpos/master.tpl
 2013-12-31 16:27:16 +01:00
Sebastian Grewe
4026eec570 Merge pull request #1187 from TheSerapher/issue-1159-dashboardsplit 
[IMPROVED]
 2013-12-31 07:19:11 -08:00
Sebastian Grewe
4a98724fc5 [FIX] Disallow to post messages for guests 
* Disallow to post messages if guest forms are disabled
 2013-12-31 16:17:02 +01:00
Sebastian Grewe
a8a7d2c52f [IMPROVED] Allow contactform for guests 
* Added admin option to disable access to contactform for guests
* Propagated new option to templates

Fixes #1185
 2013-12-31 16:14:56 +01:00
Frederick Behrends
f333bdcc0e moved blockchainsettings to extra page in admin settings 2013-12-31 04:39:27 +01:00