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

964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Grewe
f675fc7055 Removed page generation PHP from settings 
Committed those by accident, so removed.
 2013-08-05 10:08:24 +02:00
Sebastian Grewe
43d08e0835 Merge pull request #557 from TheSerapher/admin-settings 
Refactored admin panel settings
 2013-08-05 01:04:55 -07:00
Sebastian Grewe
4d77a7d299 Refactored admin panel settings 
This will allow easier integration of new settings managed by the admin
panel. Includes setting types, tooltips, tabs etc.

No open ticket, just figured I'd add this.
 2013-08-05 10:02:39 +02:00
Sebastian Grewe
2ced75b752 Merge pull request #556 from TheSerapher/issue-536 
Issue 536
 2013-08-05 00:20:53 -07:00
Sebastian Grewe
680fa46013 Merge pull request #555 from TheSerapher/issue-545 
Adding Admin MOTD
 2013-08-05 00:20:26 -07:00
Sebastian Grewe
0c35a046e0 Merge pull request #554 from TheSerapher/issue-553 
Adding jQuery Mobile 1.3.2
 2013-08-04 12:57:15 -07:00
Sebastian Grewe
fa0e7379a6 Adding jQuery Mobile 1.3.2 
* Adding new CSS and JS files
* Adding missing images
* Removing old version
* Updated master template

Fixes #553
 2013-08-04 21:53:36 +02:00
Sebastian Grewe
e9f63854d4 Update POOLS.md 
added nrpatten pools.
 2013-08-02 09:03:55 +02:00
Sebastian Grewe
c25e54f79c Adding Admin MOTD 
* Adding MOTD to admin settings
* Adding MOTD to smarty_globals as regular INFO popup

Fixes #545
 2013-08-01 16:25:43 +02:00
Sebastian Grewe
5545f8a896 adding index to archived column 2013-08-01 14:10:22 +02:00
Sebastian Grewe
7bde00c452 properly display auto-confirmed tx 2013-08-01 12:48:55 +02:00
Sebastian Grewe
95825224a1 Adding archiving flag for transactions 
* Added new column to transactions table (`007_transactions.sql`)
* Added setArchived method to mark old transactions as archived
* Honor archived flag in getBalance and getLockedBalance

This will further address and fix #536 once merged.
 2013-08-01 12:16:59 +02:00
Sebastian Grewe
3c57d5bd0a fixing missing template warnings 2013-08-01 11:29:16 +02:00
Sebastian Grewe
4eb6c59cb3 Refactored getTransactions, unified admin/user view 
* Removed getAllTransactions method
* Unified getTransactions for users and admins
* Added filter abilities to user transaction view

This should speed up things a fair bit for transaction heavy pools.

Addresses #536
 2013-08-01 11:00:54 +02:00
Sebastian Grewe
52f58807b0 Refactored admin transactions 
* Properly generate the bind_params statement
* Extended from Base Class
* Added methods to Base Class

Addresses #536
 2013-08-01 10:40:49 +02:00
Sebastian Grewe
4b3534ce61 Fixing WHERE clause for getBalance call 
Addresses #536
 2013-08-01 10:38:20 +02:00
Sebastian Grewe
9e1f424742 Great performance increase on transaction queries 
This will address an issue with database including a lot of
transactions. No more nested queries that put unwanted strain on a DB.

Address #536
 2013-08-01 10:38:20 +02:00
Sebastian Grewe
b5e12923fd Merge pull request #539 from nicoschtein/patch-1 
Added Prefix Option to run-crons.sh PID File.
 2013-08-01 00:08:45 -07:00
nicoschtein
a84c91f886 Fix PIDFILE folder check 2013-08-01 04:04:45 -03:00
Sebastian Grewe
8abfa9b355 Merge pull request #544 from TheSerapher/issue-542 
Issue 542
 2013-08-01 00:01:49 -07:00
Sebastian Grewe
ea53aaf7c2 Update POOLS.md 
Sheinsha pool updates.
 2013-08-01 08:58:26 +02:00
Nicolas Schteinschraber
038ec39e55 Added BASEPATH and SUBFOLDER configs for PIDFILE 
Checks if the path exists, if it does not, it is created, if there is
an error a message is printed with the problematic path.
 2013-08-01 02:55:33 -03:00
nicoschtein
fee9d82192 Added curly brackets to arg vars and removed extra empty arg catcher. 2013-08-01 00:11:21 -03:00
Sebastian Grewe
60bf687d1c increased limit back to 30 2013-07-31 17:11:26 +02:00
Sebastian Grewe
68c8d29a01 removed line by accident 2013-07-31 17:10:26 +02:00
Sebastian Grewe
4c37ab4950 Find actual row count without LIMITs applied 
Addresses #542
 2013-07-31 17:09:30 +02:00
nicoschtein
87315238da Properly overwrite PIDPREFIX via command line argument 2013-07-31 06:35:04 -03:00
Nicolas Schteinschraber
4c8295edc2 Added ability to pass prefix as an argument when calling script. 2013-07-31 04:28:15 -03:00
Sebastian Grewe
15728375bb Merge pull request #540 from TheSerapher/issue-524-remove-orphans 
Removing orphaned credits from Sidebars
 2013-07-31 00:00:50 -07:00
Sebastian Grewe
fd8b07f02a Removing orphaned credits from Sidebars 
This will remove some confusion for users.

Addresses #524
 2013-07-31 08:59:02 +02:00
Sebastian Grewe
cb50aa66ba Merge pull request #538 from nicoschtein/issue-537 
Issue #537
 2013-07-30 23:57:03 -07:00
Nicolas Schteinschraber
5a377d6106 Issue #537 2013-07-31 03:44:49 -03:00
nicoschtein
0a3abb363e Added Prefix Option to run-crons.sh PID File. 
Added configuration option 'PIDPREFIX' to add to PIDFILE name, so it will be unique in a multipool server.
 2013-07-31 03:01:33 -03:00
Sebastian Grewe
8f28b3c3d6 Merge pull request #534 from TheSerapher/issue-533 
Generate PID name based on script name
 2013-07-30 01:19:44 -07:00
Sebastian Grewe
527354f64e Generate PID name based on script name 
Fixes #533
 2013-07-30 10:18:49 +02:00
Sebastian Grewe
59534d1c02 Merge pull request #532 from TheSerapher/issue-529 
Fixing PPLNS target percentages
 2013-07-28 07:43:38 -07:00
Sebastian Grewe
74f9b1e388 Merge pull request #531 from TheSerapher/issue-521 
b
 2013-07-28 01:20:14 -07:00
Sebastian Grewe
900e559497 Merge pull request #530 from TheSerapher/issue-522 
Fixing notifications for findblocks cron
 2013-07-28 01:19:54 -07:00
Sebastian Grewe
97ac16b21a Fixing PPLNS target percentages 
This should fix #529 with proportional payouts towards the calculated
PPLNS target are off.
 2013-07-28 10:04:09 +02:00
Sebastian Grewe
89c539e6fd Fixing notifications for findblocks cron 
If disabled, findblocks would still send out notifications.

Thanks @feeleep75 for the heads up.

Fixes #522
 2013-07-25 13:41:13 +02:00
Sebastian Grewe
86633e1603 Adding JS/CSS code to project 
Instead of calling remote sites, deploy the JS and CSS locally. Will
allow HTTPs sites to work properly.

Fixes #521
 2013-07-24 16:37:22 +02:00
Sebastian Grewe
6a0253114f Merge pull request #520 from TheSerapher/issue-513 
Catch errors on missing templates
 2013-07-24 07:19:17 -07:00
Sebastian Grewe
c0b0d438b8 Catch errors on missing templates 
Pages that are missing a template will cause a error 500. We now catch
this and display a default string.

Fixes #513
 2013-07-24 14:56:34 +02:00
Sebastian Grewe
dcc0596c8f Merge pull request #519 from TheSerapher/issue-511 
Display network hashrate in public API
 2013-07-24 04:28:35 -07:00
Sebastian Grewe
8552679920 Merge pull request #516 from TheSerapher/logrotation-script 
Adding sample logrotation config and cron
 2013-07-24 03:51:24 -07:00
Sebastian Grewe
82250b5fd6 Merge pull request #518 from TheSerapher/issue-514 
Issue 514
 2013-07-24 03:43:49 -07:00
Sebastian Grewe
b5eca59e58 Fixing alignment in mobile template 
Addresses #514
 2013-07-24 11:41:12 +02:00
Sebastian Grewe
e760cbdc03 Fixing mobile templates 
Addresses #514
 2013-07-24 11:39:59 +02:00
Sebastian Grewe
3b75d97acc Merge pull request #517 from TheSerapher/issue-506 
adding address validation to payout crons
 2013-07-24 02:35:58 -07:00
Sebastian Grewe
3f62612af9 Fixing mobile templates too 2013-07-24 11:30:16 +02:00