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

1991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Grewe
80d0467c2d Merge pull request #1211 from TheSerapher/issue-1040 
[CHANGE] Moved from bar shares to pie shares
 2014-01-02 02:09:34 -08: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
b9877d7757 Merge pull request #1205 from rog1121/patch-1 
Fix Hardcoded blockchain
 2014-01-01 14:36:12 -08:00
rog1121
494a3a2714 Fix Hardcoded blockchain 2014-01-01 15:08:39 -07:00
Sebastian Grewe
46f7183213 Merge pull request #1202 from nevrending/patch-1 
Update POOLS.md
 2014-01-01 06:45:09 -08:00
Yefta Sutanto
4c723d4f5f Update POOLS.md 2014-01-01 19:17:16 +07:00
Sebastian Grewe
dc81ad3123 Merge pull request #1166 from TheSerapher/issue-1159 
Issue 1159
 2014-01-01 02:11:02 -08:00
Sebastian Grewe
1e612c5a94 [ADDED] Updated base structure 2014-01-01 10:32:11 +01:00
Sebastian Grewe
e762bb0391 [IMPROVED] Use data interval on getuserworkers 2014-01-01 09:08:09 +01:00
Sebastian Grewe
7ab44cc808 Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2014-01-01 08:56:56 +01:00
Sebastian Grewe
bf86cc6c25 [FIX] Do not mark cron disabled, just notify 2014-01-01 08:56:46 +01:00
Sebastian Grewe
b1cd259a3d Merge pull request #1199 from TheSerapher/issue-1196 
[FIX] Display TX Fee in account panel
 2013-12-31 23:44:29 -08:00
Sebastian Grewe
020905679a [FIX] Display TX Fee in account panel 
Fixes #1196 once merged.
 2014-01-01 08:43:53 +01:00
Sebastian Grewe
4e4ebb3d90 Merge pull request #1198 from TheSerapher/issue-1192 
[FIX] Spelling error
 2013-12-31 23:40:14 -08:00
Sebastian Grewe
6656e47fdc [FIX] Spelling error 
Fixes #1192 once merged
 2014-01-01 08:39:49 +01:00
Sebastian Grewe
4fa4259932 [CHANGE] Moved from bar shares to pie shares 
The cake is a lie! It's a pie!

Addresses #1040
 2013-12-31 23:51:39 +01:00
Sebastian Grewe
0b5e6ae250 [FIX] Removed debug test 2013-12-31 22:38:52 +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
78ef1e759c Merge pull request #1189 from TheSerapher/issue-1178 
Issue 1178
 2013-12-31 07:35:05 -08:00
Sebastian Grewe
2675a9573f [FIX] Better version 2013-12-31 16:34:37 +01:00
Sebastian Grewe
e9c780f2ee [FIX] Don not show decimals > 0.0001 fee 2013-12-31 16:32:57 +01:00
Sebastian Grewe
9c2e6fa30b [FIX] Properly display pool fee in dashboard 
Fixes #1178 once merged.
 2013-12-31 16:28:53 +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
Sebastian Grewe
a3117b889b Merge pull request #1175 from Fredyy90/patch-9 
[IMPROVEMENT] Added option to link transaction-ids to transaction on blockchainwebsite and moved blockchainsettings to extra page in admin settings
 2013-12-31 00:23:18 -08:00
Frederick Behrends
f333bdcc0e moved blockchainsettings to extra page in admin settings 2013-12-31 04:39:27 +01:00
Frederick Behrends
3b980cbf5d [IMPROVMENT] Added option to link transaction-ids to transaction on blockchainwebsite 2013-12-31 04:25:47 +01:00
Neozonz
33b06946f4 PIN Reset email template 2013-12-30 11:45:39 -08:00
Sebastian Grewe
8e4c56d597 [IMPROVED] 
Splitting dashboard calls up instead of using one single API call:

* Use getuserbalance for Balance updates
* Use getuserworkers for Worker updates

For those and potential other SQL intensive Ajax calls I have added a
long ajax refresh interval setting. It can be set via admin panel and
will change the refresh time on the JS file on the dashboard for those
two calls.

Should help a bit with high worker and transaction volume pools.

Address #1159
 2013-12-30 19:23:27 +01:00
Neozonz
5e401bd6dd fixed indent 2013-12-30 09:17:22 -08:00
Sebastian Grewe
b2ac77d9a5 Merge pull request #1128 from nicoschtein/patch-12 
Make TXId & Address clickable on Transaction Lists
 2013-12-30 03:23:14 -08:00
Sebastian Grewe
e56f8f9acc Merge pull request #1167 from TheSerapher/issue-1158 
[SECURITY] Better token generator
 2013-12-30 03:16:58 -08:00
Sebastian Grewe
2c18abf8be [SECURITY] Better token generator 2013-12-30 12:15:36 +01:00
Sebastian Grewe
fad153728a Merge pull request #1156 from zarethernet/patch-1 
Update POOLS.md
 2013-12-30 03:07:30 -08:00
Sebastian Grewe
abb3688e56 [FIX] Hardcoded confirms removed 2013-12-30 12:05:33 +01:00
Sebastian Grewe
48a4edad5b [FIX] Proper account summary 2013-12-30 12:02:38 +01:00
Sebastian Grewe
de302a03dc [IMPROVED] data gathering for Auto Payout 
* Using improved SQL query created by @feeleep75
* Adjusted the query to further cut down the data returned

Fixes #1159 once merged.
 2013-12-30 11:57:29 +01:00
Neozonz
e3db7e0a02 Initial commit for pin reset functionality 2013-12-30 03:29:20 -05:00
Sebastian Grewe
96d096f669 [MERGE] Fix merge conflict 2013-12-30 08:19:13 +01:00
Nikolay Beresnev
a580f03996 Update POOLS.md 
Add pool Crypto-Com
 2013-12-30 03:41:16 +07:00
Sebastian Grewe
f4a1110c48 Merge pull request #1089 from TheSerapher/issue-1043 
Issue 1043
 2013-12-28 12:23:23 -08:00
Sebastian Grewe
bac119dcc8 Merge pull request #1132 from poolpm/patch-1 
[FIX] Wrong behavior on Edit Account with no addy
 2013-12-28 12:18:05 -08:00
Sebastian Grewe
ce1aab1f49 Merge pull request #1150 from neonbunny/next 
Fix for reflected XSS security issue.
 2013-12-28 10:41:56 -08:00
neonbunny
f94e48eb89 Fix for reflected XSS security issue. 2013-12-28 17:34:09 +00:00