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

2365 Commits

Author SHA1 Message Date
Sebastian Grewe
35bef0f00a [FIX] Round progress number 2014-03-04 15:04:21 +01:00
Sebastian Grewe
c3a31b08c6 [FIX] Merge conflict, proper CSS fix 2014-03-04 13:53:59 +01:00
Sebastian Grewe
a980773ae6 [DASHBOARD] More work and samples 2014-03-04 13:51:02 +01:00
nrpatten
88caa1a5a0 [UPDATE] Overview Footer margin -15px 2014-03-04 04:06:03 -08:00
Sebastian Grewe
746c2ef70c [UPDATE] Dashboard graphs with proper boxes 2014-03-04 12:46:39 +01:00
nrpatten
36cda4a61c Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-04 03:41:26 -08:00
nrpatten
b6b0006f96 [UPDATE] Dashboard Layout 2014-03-04 03:40:18 -08:00
Sebastian Grewe
4b56420e68 [FIX] Bar chart updates 2014-03-04 12:03:33 +01:00
iAmShorty
5cab314689 [FIX] changed template and calc 2014-03-04 11:59:10 +01:00
iAmShorty
c2747a183b [FIX] closing if 2014-03-04 11:51:36 +01:00
iAmShorty
bba3781ebf [FIX] Wallet Balance Newmint Calc Fix 2014-03-04 11:48:28 +01:00
Sebastian Grewe
59aef1d1e3 Merge branch 'development' into bootstrap 2014-03-04 10:41:37 +01:00
Sebastian Grewe
75c20a4baa [SQL] Updated blocks table share_id to bigint 
Will avoid issues with BIGINT from shares table getting too big for the
INT on the blocks share_id column.

Thanks IRC@webxassDE for the heads up!
 2014-03-04 10:21:46 +01:00
iAmShorty
8e8736ef47 [CHANGE] notifications 2014-03-04 10:05:10 +01:00
nrpatten
779bbb847e Dashboard Test Setout 2014-03-04 01:00:06 -08:00
iAmShorty
a17a7f7602 [UPDATE] style fix dashboard account balance 2014-03-04 09:03:24 +01:00
iAmShorty
4820cc7bf9 [UPDATE] style fix for confirmations 2014-03-04 08:57:46 +01:00
iAmShorty
57e6b2dd8c [FIX] permission fix 2014-03-03 17:34:53 +01:00
iAmShorty
887eef3f37 [FIX] fixed typo in notification class 2014-03-03 17:34:09 +01:00
iAmShorty
1960df0d91 [UPDATE] updated query and template 2014-03-03 16:59:06 +01:00
iAmShorty
74ac29efc8 [FIX] delete screenshot 2014-03-03 15:45:25 +01:00
iAmShorty
45f9b2a290 [FIX] delete temp file 2014-03-03 15:43:55 +01:00
iAmShorty
84b62aedbd [FEATURE] timeframed earning stats 2014-03-03 15:43:23 +01:00
Sebastian Grewe
d470daea45 [CHANGED] Basic layout idea for dashboard 2014-03-03 12:32:52 +01:00
Sebastian Grewe
0ce22ebf7a [ADDED] Template Editor 2014-03-03 11:44:06 +01:00
Sebastian Grewe
c249b7bac5 Merge pull request #1877 from iAmShorty/hashrate-fix 
[FIX] another hashrate calc error
 2014-03-03 11:43:13 +01:00
iAmShorty
ec06339867 [FIX] another hashrate calc error 2014-03-03 11:42:03 +01:00
Sebastian Grewe
b59f878c22 [MERGE] Development, merge conflicts fixed 2014-03-03 10:50:58 +01:00
Sebastian Grewe
d17eec85d0 Merge pull request #1873 from rog1121/master 
Use Defined Limit on getusertransactions API
 2014-03-03 10:36:27 +01:00
Sebastian Grewe
a1dbe8bb09 [FIX] Workaround for missing confirmations 
This will fix issues with those coins that don't track confirmations for
blocks inside the getblock RPC call. It will try to fallback to the
transactions confirmations and insert those instead.

Fixes #1823 as mentioned by @ice00 - Thanks for that!
 2014-03-03 09:42:36 +01:00
iAmShorty
f891743aed [FIX] fixed calculation 2014-03-03 08:50:12 +01:00
iAmShorty
863dbb56eb [FIX] fixed nethashrate for some coins 2014-03-03 08:41:44 +01:00
rog1121
73f4cafc28 Use Defined Limit 2014-03-02 12:16:14 -07:00
rog1121
b8aa9f8738 Update getusertransactions.inc.php 2014-03-02 12:07:22 -07:00
iAmShorty
9fa4b17207 [CHANGE] move transaction summary to earnings to add timeframed stats later 2014-03-02 18:08:38 +01:00
iAmShorty
6733c49bbd [FIX] dashboard headers and workers 2014-03-02 18:03:36 +01:00
iAmShorty
66473d1464 [FIX] style changes 2014-03-02 17:59:56 +01:00
iAmShorty
4c22c41fc1 [FIX] fixed div 2014-03-02 17:40:40 +01:00
iAmShorty
6705f879b1 [UPDATE] total user earnings, icons in invitations 2014-03-02 17:36:21 +01:00
Sebastian Grewe
6fd55536fa [FIX] Removed method call on PPS globals 2014-03-02 16:26:31 +01:00
iAmShorty
8751610ed8 [UPDATE] bringing back cell colors for confirmed/unconfirmed/orphan 2014-03-02 15:04:27 +01:00
iAmShorty
409fc0f7e0 [FIX] add news defaults to smarty 2014-03-02 14:43:14 +01:00
iAmShorty
057f453ff5 [UPDATE] make news style as an option 2014-03-02 14:37:51 +01:00
iAmShorty
36f8f95da9 [FIX] undefined variables, smarty defaults 2014-03-02 14:10:19 +01:00
Sebastian Grewe
58807e580b [FIX] PHP Notice on Admin Settings page 2014-03-02 12:33:40 +01:00
iAmShorty
257949f443 [UPDATE] another footer fix 2014-03-02 11:27:14 +01:00
iAmShorty
1428c5cbf2 [UPDATE] footer fix 2014-03-02 11:15:41 +01:00
Sebastian Grewe
5ae3f96153 [ADDED] Sparkline Sharerate 2014-03-02 10:57:27 +01:00
Sebastian Grewe
14c9f00d8c [UPDATE] Number formatting 2014-03-02 10:43:32 +01:00
Sebastian Grewe
5e6bf2e765 [ADDED] Sparkline dashboard example for Live API 2014-03-02 10:33:20 +01:00
Sebastian Grewe
8b13d0193e [REVERT] Permission changes 2014-03-02 08:20:22 +01:00
Barry Deeney
7dce981901 Added the getLastValid function for findblock cron 2014-03-02 11:02:28 +08:00
rog1121
30387abede Add TAC Content and Change News Icon 2014-03-01 19:41:11 -07:00
rog1121
322deabe87 Update Login, Registration, TOS, and Donors Page 2014-03-01 19:27:51 -07:00
rog1121
d210537889 Fix Footer 2014-03-01 18:50:31 -07:00
rog1121
aa4cb8e8ee Permissions Fix #2 2014-03-01 18:27:23 -07:00
rog1121
d6b223c9be Permissions Fix 2014-03-01 18:25:58 -07:00
rog1121
06a033dd71 Permissions again 2014-03-01 18:07:44 -07:00
rog1121
787ad972ec site_assets Permissions 2014-03-01 18:06:37 -07:00
rog1121
93981f6044 Various Fixes 2014-03-01 17:57:43 -07:00
rog1121
7e3623d659 Various Fixes 2014-03-01 17:56:23 -07:00
rog1121
639d4ccb10 Fix Notifications Class 2014-03-01 17:00:51 -07:00
rog1121
2b6a9b44f0 Fix Things 2014-03-01 16:58:17 -07:00
rog1121
91cad4971e Remove Switch Scrips 2014-03-01 16:32:52 -07:00
rog1121
7e4d891915 Fix Notification Switches and Worker Add Button 2014-03-01 16:28:57 -07:00
rog1121
36e23aa735 Fix Datables CSS & Master Template 2014-03-01 16:19:37 -07:00
rog1121
6f5c5d70c6 Panel Inception Fix 2014-03-01 16:04:35 -07:00
iAmShorty
efa5c0b7bd Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 2014-03-02 00:00:41 +01:00
iAmShorty
5ff6298d6c [UPDATE] fixed divs 2014-03-02 00:00:21 +01:00
rog1121
c78b2a3d29 Notification Page Switches 2014-03-01 15:55:45 -07:00
rog1121
e017fc94cd Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 
Switches
 2014-03-01 15:54:05 -07:00
rog1121
d4ebc926bc Switches 2014-03-01 15:53:55 -07:00
iAmShorty
d6443665ff Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 2014-03-01 23:53:16 +01:00
iAmShorty
3caabaa3f1 [UPDATE] pagination in admin 2014-03-01 23:52:50 +01:00
rog1121
a86dbb24b6 Fix Stuff 2014-03-01 15:46:43 -07:00
rog1121
49df84263b Fix Div 2014-03-01 15:41:43 -07:00
rog1121
a824c01e51 Notifications Padding 2014-03-01 15:38:20 -07:00
iAmShorty
5bd8fcbc12 [UPDATE] pagination in admin transactions 2014-03-01 23:35:04 +01:00
iAmShorty
f56530851f [UPDATE] pagination in admin transactions 2014-03-01 23:33:53 +01:00
iAmShorty
2e15dd955e [UPDATE] pagination in admin transactions 2014-03-01 23:31:12 +01:00
Sebastian Grewe
3139333a3d [FIX] Transaction Pagination and PHP Notice 2014-03-01 23:31:00 +01:00
rog1121
c8258d8f29 Fix News Form 2014-03-01 15:27:10 -07:00
rog1121
f727f9c38a News Buttons 2014-03-01 15:23:34 -07:00
root
892f167435 Admin Page Settings Button 2014-03-01 15:17:59 -07:00
root
933319d311 Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 
Edit Account Page Buttons
 2014-03-01 15:14:16 -07:00
root
c21078ef13 Edit Account Page Buttons 2014-03-01 15:14:01 -07:00
Sebastian Grewe
5b8dcb0e9e Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-01 23:08:22 +01:00
Sebastian Grewe
82f6f91327 [UPDATE] Search block height input addon 2014-03-01 23:08:07 +01:00
root
b2e48cb2d4 TX Page 2014-03-01 15:01:57 -07:00
Sebastian Grewe
ad179c35dd Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-01 22:59:58 +01:00
Sebastian Grewe
8a1a16c607 [UPDATE] Blocks pager, unified 2014-03-01 22:59:53 +01:00
iAmShorty
d52f241192 [UPDATE] block search and padding 2014-03-01 22:56:36 +01:00
Sebastian Grewe
238a2a3d4d Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-01 22:49:23 +01:00
Sebastian Grewe
97fb16eb32 [FIX] PHP Notices on Prop/PPLNS change on Reports page 2014-03-01 22:49:01 +01:00
root
ed41ea8198 Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 
Round Datatable
 2014-03-01 14:43:12 -07:00
root
d58f8b1b8e Round Datatable 2014-03-01 14:42:37 -07:00
iAmShorty
fe93fa5429 Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 2014-03-01 22:29:04 +01:00
Sebastian Grewe
8ac9aa8500 Merge branch 'master' into bootstrap 2014-03-01 22:28:20 +01:00
Sebastian Grewe
429ef80430 [FIX] Pagination for Block Stats 2014-03-01 22:27:59 +01:00
iAmShorty
134e96f773 [UPDATE] adding footer and html tags 2014-03-01 22:27:55 +01:00
Sebastian Grewe
1fa5d3b23e [UPDATE] Uptime Robot Status 2014-03-01 22:21:15 +01:00
iAmShorty
8b093b6c2b [UPDATE] round stats pagination and search 2014-03-01 22:05:34 +01:00
Sebastian Grewe
b4e44aba30 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-01 21:52:06 +01:00
Sebastian Grewe
aabab56027 [UPDATE] Worker column alignments 2014-03-01 21:52:00 +01:00
iAmShorty
78e4a4b3ba [UPDATE] fixed news header 2014-03-01 21:48:37 +01:00
root
067df810b6 Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 
Conflicts:
	public/templates/bootstrap/statistics/round/pplns_transactions.tpl

Datatables
 2014-03-01 13:45:10 -07:00
root
dfc71bfeeb Datatables 2014-03-01 13:42:53 -07:00
iAmShorty
a68a77b832 [UPDATE] pagination in round stats 2014-03-01 21:41:23 +01:00
Sebastian Grewe
02f4f967b1 [UPDATE] Pool stats, right align numbers 2014-03-01 21:24:49 +01:00
iAmShorty
481a7b4e41 [UPDATE] paginatin in user transactions 2014-03-01 21:19:59 +01:00
root
bb0b9dc8be Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 
Purty News
 2014-03-01 13:12:03 -07:00
root
7976715fb4 Make News Page Purty 2014-03-01 13:11:27 -07:00
Sebastian Grewe
e6031dec53 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-01 21:03:44 +01:00
Sebastian Grewe
6fc8c29487 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 
Conflicts:
	public/templates/bootstrap/admin/reports/earnings_control.tpl
 2014-03-01 21:03:29 +01:00
Sebastian Grewe
552f8d6912 [FIX] Reports page 2014-03-01 21:01:32 +01:00
root
2eecf3aac3 Fix News Container 2014-03-01 13:00:37 -07:00
root
6ea8986a7d Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 
Fix Typo
 2014-03-01 12:57:56 -07:00
iAmShorty
cd7f79ecf6 [UPDATE] typo in news 2014-03-01 20:58:29 +01:00
root
f0d6fcd84f Fix Typo 2014-03-01 12:57:44 -07:00
root
ca2e8a4af5 Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 
No-Padding
 2014-03-01 12:55:56 -07:00
iAmShorty
3e2620625e [UPDATE] style changes, icons 2014-03-01 20:56:08 +01:00
root
06971039db No-Padding 2014-03-01 12:55:42 -07:00
iAmShorty
ab56723d58 [UPDATE] changed checkboxes to switches 2014-03-01 20:35:38 +01:00
root
be595a3035 Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 2014-03-01 12:26:17 -07:00
iAmShorty
f45c1e85ae [UPDATE] borderless css, switch in account edit 2014-03-01 20:27:14 +01:00
root
cf0218852a Dashboard No-Padding 2014-03-01 12:25:33 -07:00
Sebastian Grewe
9a87874d45 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-01 20:23:38 +01:00
Sebastian Grewe
9f89ac4ec1 [FIX] Round stats 2014-03-01 20:23:28 +01:00
iAmShorty
a4ad33bbf8 [UPDATE] notification switches 2014-03-01 20:22:17 +01:00
root
f76a157a4d Stats No-Padding 2014-03-01 12:18:23 -07:00
root
807e8d830c Workers Table 2014-03-01 12:12:39 -07:00
root
66afbdb2dc No-padding Tables 2014-03-01 12:10:14 -07:00
Sebastian Grewe
00e901f919 [FIX] Store Notification OFF settings 2014-03-01 20:06:00 +01:00
root
1c529c891d Pretty Notification Tables 2014-03-01 11:58:26 -07:00
iAmShorty
42dff8a612 [UPDATE] notification switches 2014-03-01 19:56:52 +01:00
root
2cccba09f3 Fix Dashboard Padding 2014-03-01 11:43:15 -07:00
Sebastian Grewe
220a406acd [JS] Bootstrap Switch 2014-03-01 19:22:27 +01:00
root
6567dc71f9 Fix Workers 2014-03-01 11:11:25 -07:00
root
fe30dbd24d Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap 2014-03-01 11:01:21 -07:00
root
8d06b629e9 Worker Prepends 2014-03-01 11:00:41 -07:00
Sebastian Grewe
0b2aecbad9 Merge branch 'master' into development 2014-03-01 19:00:11 +01:00
Sebastian Grewe
6e593541dd [FIX] Password checker 2014-03-01 18:45:46 +01:00
Sebastian Grewe
12036896b3 [FORMAT] Registration page 2014-03-01 18:40:14 +01:00
Sebastian Grewe
38a97c6811 [REMOVED] Console debug JS log 2014-03-01 18:32:54 +01:00
iAmShorty
e26e35ed33 [UPDATE] more icons 2014-03-01 18:29:18 +01:00
Sebastian Grewe
07e5985e54 [UPDATE] Further reduce opacity 2014-03-01 18:28:35 +01:00
Sebastian Grewe
54e326a666 Revert "Revert "[UPDATE] Formatting"" 
This reverts commit c56962f6af.
 2014-03-01 18:20:12 +01:00
Sebastian Grewe
dcc008e7d7 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-01 18:19:45 +01:00
Sebastian Grewe
cd321daa5a [FIX] messed up variable names 2014-03-01 18:19:32 +01:00
iAmShorty
97a5e775c2 [UPDATE] news edit page 2014-03-01 18:17:08 +01:00
iAmShorty
bda7e8a4da [UPDATE] news page 2014-03-01 18:00:33 +01:00
Sebastian Grewe
c56962f6af Revert "[UPDATE] Formatting" 
This reverts commit aaf5d6ae58.
 2014-03-01 17:57:13 +01:00
Sebastian Grewe
aaf5d6ae58 [UPDATE] Formatting 2014-03-01 17:55:12 +01:00
Sebastian Grewe
0445011a79 [FIX] Scrollbard in Block Overview, formattting 2014-03-01 17:50:10 +01:00
iAmShorty
4c2f5ba11c [UPDATE] fixed missing pages, style changes 2014-03-01 17:31:40 +01:00
iAmShorty
cac13f2100 [UPDATE] adding icons to headers 2014-03-01 17:05:23 +01:00
iAmShorty
c9801dac2e [UPDATE] fixed pool graphs 2014-03-01 14:24:13 +01:00
Sebastian Grewe
1f6025a511 [FIX] Dont parse height as string 2014-03-01 14:17:34 +01:00
Sebastian Grewe
c7fd0ce02d [FIX] Proper Block graphs 2014-03-01 14:16:38 +01:00
Sebastian Grewe
aa2c53bec7 Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-01 13:56:33 +01:00
Sebastian Grewe
97ee53d726 [FIX] Recent notifications & same symbol as navbar 2014-03-01 13:56:03 +01:00
iAmShorty
fc6f5c2d38 [UPDATE] static round information 2014-03-01 13:54:01 +01:00
Sebastian Grewe
73e1c14664 [FIX] Payout notification type in list 2014-03-01 13:51:26 +01:00
Sebastian Grewe
8bcce6c37d Merge branch 'development' into bootstrap 2014-03-01 13:50:55 +01:00
Sebastian Grewe
735bdadd88 [FIX] Payout notification type in list 2014-03-01 13:50:03 +01:00
Sebastian Grewe
34079926e0 [CLEANUP] More code cleanup for last notifications 2014-03-01 13:44:04 +01:00
Sebastian Grewe
6a5376eaec [FIX] PHP Notice undeclared variable 2014-03-01 13:40:10 +01:00
iAmShorty
8f4c5cc570 [UPDATE] added notifications to header 2014-03-01 12:37:53 +01:00
iAmShorty
872661704d [UPDATE] graph colors 2014-03-01 11:54:50 +01:00
iAmShorty
f79cbc6c1e [UPDATE] cleanup 2014-03-01 10:58:19 +01:00
iAmShorty
464a16d83d [UPDATE] ported graphs to morris 2014-03-01 10:57:33 +01:00
Sebastian Grewe
c493f60d96 [FIX] HTML tags 2014-03-01 10:26:53 +01:00
iAmShorty
52a96b2ebb [UPDATE] auto activate first tab 2014-02-28 23:28:34 +01:00
iAmShorty
b0d9e1acd2 [UPDATE] hashrate graphs 2014-02-28 23:04:39 +01:00
Contex
4d2606bedc Fixed table cells for general_stats.tpl 
<th></td> is obviously wrong
 2014-02-28 21:09:28 +01:00
Sebastian Grewe
9a949dbbb1 [FIX] Proper block shares graph 2014-02-28 20:57:11 +01:00
iAmShorty
7924ea0545 [UPDATE] block graphs 2014-02-28 13:41:40 +01:00
iAmShorty
7ebb6bf30d [UPDATE] userinfo styled 2014-02-28 11:54:51 +01:00
iAmShorty
5bc1ad761d [UPDATE] reports styled 2014-02-28 11:38:33 +01:00
iAmShorty
d18ada421c [UPDATE] modal style fix 2014-02-28 11:16:07 +01:00
iAmShorty
31d9f73dee [UPDATE] TAC Modal Window 2014-02-28 11:10:21 +01:00
Sebastian Grewe
dbd26e8be1 [FIX] PHP Notice if wallet down 2014-02-28 09:28:50 +01:00
Sebastian Grewe
6544bc5cba Merge branch 'development' into bootstrap 2014-02-28 09:20:42 +01:00
Sebastian Grewe
dcdc22b15b [ADDED] Missing comment 2014-02-28 09:20:07 +01:00
Sebastian Grewe
9969352056 [FIX] Potential regression 2014-02-28 09:18:38 +01:00
Sebastian Grewe
aac80502e1 [FIX] Bail findblocks on block insertion errors 
Fixes #1857 once merged.
 2014-02-28 09:09:29 +01:00
root
892ca5f85f Some updates 2014-02-27 23:29:07 -07:00
root
8f1be2adf8 Dashboard Layout 2014-02-27 20:35:24 -07:00
root
b85438858e Stats Page Tweaks 2014-02-27 18:37:45 -07:00
root
dabe58a7b6 Test 2014-02-27 18:25:03 -07:00
root
047ebb2185 Fix Error Class 2014-02-27 18:22:43 -07:00
root
2c946df157 Fix Wallet Panels 2014-02-27 18:14:56 -07:00
root
a50f204939 Plethora of updates 2014-02-27 17:59:02 -07:00
root
fc4ead86cf Fix the fix 2014-02-27 16:39:19 -07:00
root
b1baedfb1f Nix navigation Erros 2014-02-27 16:25:54 -07:00
Sebastian Grewe
12b80856c4 [UPDATE] Enable PPLNS Backpay by default 2014-02-27 22:34:47 +01:00
iAmShorty
7b86293278 [UPDATE] notifications for pages 2014-02-27 22:16:26 +01:00
iAmShorty
9cec714993 [UPDATE] notification fix 2014-02-27 21:56:39 +01:00
iAmShorty
f6599f338b [UPDATE] wallet layout 2014-02-27 21:32:22 +01:00
iAmShorty
3b84458443 [UPDATE] settings layouts 2014-02-27 20:37:45 +01:00
iAmShorty
f74b63f7de [UPDATE] admin center layouts 2014-02-27 18:57:06 +01:00
iAmShorty
549d4dd749 [BOOTSTRAP] basic implementation 2014-02-27 17:45:48 +01:00
Sebastian Grewe
8d369d5ba4 [IMPROVED] Deduct TXFEE in Transaction CreateDebit 
No need to deduct the fees on our cronjob, do it automatically in our
transaction class when creating a Debit record.
 2014-02-27 15:19:01 +01:00
Sebastian Grewe
5966f77e76 [ADDED] Hashrate modifier name and value 
* [ADDED] Hashrate modifier value to getnavbardata
* [ADDED] Hashrate modifier name to getnavbardata

Fixes #1845 once merged.
 2014-02-27 15:19:00 +01:00
Sebastian Grewe
52b8ecca89 Merge pull request #1849 from MPOS/ctoken-missing 
[FIX] Do not use CTOKEN if CSRF disabled
 2014-02-27 12:38:09 +01:00
Sebastian Grewe
9ad568a1d1 [FIX] Do not use CTOKEN if CSRF disabled 
* [FIX] Workers page not checking for CTOKEN properly

Fixes #1848 once merged.
 2014-02-27 11:56:46 +01:00
Sebastian Grewe
d857a3d85e [FIX] No captcha on contactform if disabled 
Fixes #1846 once merged
 2014-02-27 11:07:37 +01:00
iAmShorty
6fb8f835ed [FIX] added >= to values 2014-02-26 11:18:59 +01:00
Sebastian Grewe
bcc45e22cf [FIX] Same fix for hashrate list 
Formatting updated
 2014-02-26 10:47:10 +01:00
Sebastian Grewe
6df2010b53 [FIX] Donor icons out of order 2014-02-26 10:42:45 +01:00
Sebastian Grewe
bbba9d1daf Merge pull request #1837 from MPOS/unified-user-miningstats 
Unified user miningstats
 2014-02-26 09:53:41 +01:00
Sebastian Grewe
3e64dd3487 Merge pull request #1798 from MPOS/x-forwarded-for-check 
[CHANGED] Parse X-FORWARDED-FOR when supplied
 2014-02-26 09:53:29 +01:00
Sebastian Grewe
858c2cb24c Merge pull request #1826 from iAmShorty/PoS-Balance-Fix 
[FIX] Newmint Payout Fix
 2014-02-26 09:53:17 +01:00
Sebastian Grewe
9955b1ec5c Merge pull request #1829 from iAmShorty/donor-icons 
[UPDATE] nicer donor icons
 2014-02-26 09:53:03 +01:00
Sebastian Grewe
d750e81b02 [FIX] Wait for global cache data, don't run queries 2014-02-26 09:42:49 +01:00
iAmShorty
20374a1eac [UPDATE] changed template 2014-02-26 09:35:50 +01:00
Sebastian Grewe
78619c1427 [IMPROVED] Unified user speed statistics 
* [ADDED] getUserMiningStats to fetch all speed related data
 * Uses global cache if available, falls back to local query and then
   local caches
* [REMOVED] getUserHashrate, getUserSharerate, getUserAvgShareDifficulty
* [UPDATED] All code occurences for the above to use the new system

Probably won't change much since global cache was already used but does
help on the Dashboard since we combine at least 2 calls into one.
 2014-02-26 09:27:32 +01:00
iAmShorty
9ae66915c8 [UPDATE] added Asteroids MacOS Miner 2014-02-25 12:49:57 +01:00
iAmShorty
54652cb93f [FIX] added default values 2014-02-25 09:29:09 +01:00
iAmShorty
c39db3bec3 [UPDATE] changed icons 2014-02-25 09:10:06 +01:00
iAmShorty
a52909d909 [UPDATE] changed icons 2014-02-25 08:53:12 +01:00
iAmShorty
67ca76279d [UPDAT] added footer, cleanup 2014-02-24 22:48:57 +01:00
iAmShorty
3381b0e60a [FIX] Typo 2014-02-24 21:24:03 +01:00
iAmShorty
8b3d5ec138 [UPDATE] nicer donor icons 2014-02-24 21:16:15 +01:00
iAmShorty
c6b060dbd5 [FIX] Newmint Payout Fix 2014-02-24 20:31:53 +01:00
Sebastian Grewe
b2f555a83a Merge pull request #1820 from iAmShorty/users-registered 
[UPDATE] Adding registrations and Regdate to Admin Dashboard and Userinfo
 2014-02-24 15:02:55 +01:00
iAmShorty
42aa77c454 [UPDATE] links in dashboard, cleanup dashboard 2014-02-24 14:49:42 +01:00
iAmShorty
759b8a2e7a [UPDATE] separate pages, new icons, navigation update 2014-02-24 14:40:46 +01:00
iAmShorty
ddb80a791b [UPDATE] added anchors for pagination 2014-02-24 14:07:47 +01:00
iAmShorty
f09d7c4b7c [UPDATE] fixed typo 2014-02-24 13:15:28 +01:00
Sebastian Grewe
dc1fe9aa35 Merge pull request #1799 from MPOS/debug-to-logfile 
[IMPROVED] Allow debug console log to logfile
 2014-02-24 11:26:43 +01:00
iAmShorty
bf8673b1f0 [UPDATE] changed text 2014-02-24 11:25:05 +01:00
iAmShorty
55266e274a [UPDATE] added pagination to reg and invite 2014-02-24 11:24:13 +01:00
Nathan Patten
02568df759 Update default.tpl 2014-02-24 21:16:14 +11:00
Nathan Patten
966d32036b Update chat.inc.php 2014-02-24 21:12:15 +11:00
iAmShorty
0f9cdb915c [UPDATE] fixed typo in sql queries 2014-02-24 10:58:23 +01:00
iAmShorty
d419b1f0ff [UPDATE] sorting by count 2014-02-24 10:56:47 +01:00
iAmShorty
37b8d5a56b [UPDATE] changed hardcoded table names 2014-02-24 10:52:12 +01:00
iAmShorty
fbdd811d7f [UPDATE] added top inviter, some code cleanup 2014-02-24 10:39:09 +01:00
Nathan Patten
d5c63ff824 Update smarty_globals.inc.php 2014-02-24 20:32:00 +11:00
Nathan Patten
0c064d4d58 Update default.tpl 2014-02-24 20:28:49 +11:00
Nathan Patten
624c613c89 Update admin_settings.inc.php 2014-02-24 20:28:09 +11:00
Nathan Patten
3ea023e6e0 Blah 2014-02-24 20:21:27 +11:00
Nathan Patten
7f8c5e8270 Blah 2014-02-24 20:18:14 +11:00
Nathan Patten
17509aa3b9 Update admin_settings.inc.php 2014-02-24 20:02:45 +11:00
Nathan Patten
ae9c220521 Update chat.inc.php 2014-02-24 20:01:02 +11:00
Nathan Patten
a9cc0a9ec9 Update smarty_globals.inc.php 2014-02-24 19:56:51 +11:00
Nathan Patten
aac9b70aac Update smarty_globals.inc.php 2014-02-24 19:30:08 +11:00
Nathan Patten
3418c3db77 Update chat.inc.php 2014-02-24 19:29:01 +11:00
Nathan Patten
9372da9aa8 Update default.tpl 2014-02-24 19:28:26 +11:00
Nathan Patten
467a9531a6 Update navigation.tpl 2014-02-24 19:27:53 +11:00
Nathan Patten
b1af60709e [EDIT] move from acl to system 
Was going to do this the first time.. dunno why i put it in acl :p
 2014-02-24 19:17:31 +11:00
iAmShorty
00c184d45e [UPDATE] cleaning up admin dashboard 2014-02-23 22:58:57 +01:00
iAmShorty
d0a82be11b [UPDATE] adding if user was invited and inviter to registered users 2014-02-23 22:30:52 +01:00
iAmShorty
23afae0aaf [UPDATE] added last 10 registered users to dashboard 2014-02-23 21:35:20 +01:00
iAmShorty
7ffa620975 [UPDATE] Adding Reg Date to Userinfo in Admin Panel 2014-02-23 20:48:58 +01:00
iAmShorty
47f6048378 [UPDATE] Adding registrations to Admin Dashboard 2014-02-23 20:23:21 +01:00
Nathan Patten
45127409ed [FIX] Web Chat Disabled bt default 2014-02-23 07:26:36 +11:00
Nathan Patten
0e81af405a [FIX]tablesorter margin on resize 
Stops the tablesorter from pushing right on window resize
 2014-02-23 07:14:06 +11:00
Nathan Patten
ac8657e909 [ADD] Donor 2014-02-22 21:43:57 +11:00
Nathan Patten
e7ec045785 [ADD] Donor 2014-02-22 21:42:45 +11:00
Nathan Patten
a68a5675b1 [ADD] Chat Link To Nav 2014-02-22 21:39:22 +11:00
Nathan Patten
fdd8cb64f9 Create disabled.tpl 2014-02-22 21:36:14 +11:00
Nathan Patten
2aab514624 [ADD] Chat tpl 2014-02-22 21:35:27 +11:00
Nathan Patten
b79bd6ae8e [ADD] Chat 2014-02-22 21:33:49 +11:00
Nathan Patten
305d0e4cc9 [ADD] Chat settings 2014-02-22 21:32:30 +11:00
Nathan Patten
b657d41bd6 [ADD] Chat global 2014-02-22 21:30:11 +11:00
iAmShorty
c5ff564deb [FIX] Wallet Balance 2014-02-20 20:59:54 +01:00
Sebastian Grewe
865cd96f5e [IMPROVED] Allow debug console log to logfile 
* Needs logging level set to 7 in security config
* Needs debugging enabled in global config
 2014-02-20 09:01:18 +01:00
Sebastian Grewe
28d114b099 [ADDED] Use getCurrentIP on IP check 2014-02-20 08:26:58 +01:00
Sebastian Grewe
8bd469ba5d [CHANGED] Parse X-FORWARDED-FOR when supplied 
Instead of trusting REMOTE_ADDR we should parse X-FORWARDED-FOR if
supplied. This will properly use the user IP in a multi-LB setup.

Needs testing
 2014-02-19 14:32:20 +01:00
iAmShorty
e16db6071e [FIX] Wallet Balance Fix 2014-02-19 09:45:35 +01:00
Sebastian Grewe
8cb42aab2b Merge pull request #1770 from iAmShorty/realbalance-wrapper 
[FIX] return balance from main account
 2014-02-19 09:34:01 +01:00
Sebastian Grewe
a4e3468b9b [CHANGE] 500 default limit 2014-02-18 09:22:16 +01:00
Sebastian Grewe
7229b5b130 [ADDED] Payout Queue Limiter 
* [ADDED] LIMIT to getMPQueue and getAPQueue
* [ADDED] Default config payout queue size of 1000 for MP and 1000 for AP
* [UPDATED] Payouts cronjob to use this new default limits

This may help some coins that have tx count issues when doing sendmany.
Other coins can play with the values to find their sweet spot. Run the
payout multiple times in a row to force more transactions of the same
amount.

Fixes #1773 and thanks to @jrwr for the idea!
 2014-02-18 09:16:26 +01:00
iAmShorty
8f4237945b [UPDATE] make it uppercase 2014-02-17 15:40:26 +01:00
iAmShorty
4532bd6601 [UPDATE] add coinname to qrode 2014-02-17 15:39:10 +01:00
iAmShorty
63ba74fc60 [UPDATE] balance fix for cron and wallet 2014-02-16 17:32:05 +01:00
iAmShorty
d2be015554 [FIX] return balance from main account 2014-02-16 16:44:36 +01:00
Sebastian Grewe
85f985060b Merge pull request #1766 from rog1121/notification-fix 
Notifications Fix
 2014-02-16 14:50:38 +01:00
Sebastian Grewe
cdaf757b8b Merge branch 'next' of github.com:MPOS/php-mpos into next 2014-02-16 08:32:10 +01:00
Sebastian Grewe
6f5d866bb9 [ADDED] Force run even if cron is active with -f 2014-02-16 08:31:47 +01:00
Sebastian Grewe
5c22cc3c08 Merge pull request #1764 from MPOS/combine-cleanups 
[IMPROVED] Combined cleanup tasks into single PHP
 2014-02-16 08:12:11 +01:00
Sebastian Grewe
e6a396c85b Merge pull request #1750 from iAmShorty/wallet-info-adminpanel 
[ENHANCEMENT] Wallet info adminpanel
 2014-02-16 08:12:03 +01:00
Sebastian Grewe
5dd13d4475 Merge pull request #1757 from MPOS/getrealbalance-wrapper 
[ADDED] getrealbalance wrapper for payouts
 2014-02-16 08:11:08 +01:00
rog1121
eb382b677c Notifications Fix 2014-02-15 18:00:36 -07:00
iAmShorty
45d79d0eab [UPDATE] style change for addresses 2014-02-15 23:17:37 +01:00
Sebastian Grewe
d1f3f5d01d [UPDATE] Return negative balance if main is negative 2014-02-15 19:17:12 +01:00
Sebastian Grewe
146b56259b [IMPROVED] Combined cleanup tasks into single PHP 
* [IMPROVED] Logging format for all cleanup tasks
* [UPDATED] Cron shellescripts
* [UPDATE] Cron Monitoring Page
* [DELETED] Old `*_cleanup.php` scripts
 2014-02-15 19:01:25 +01:00
iAmShorty
2acf83894d only show new table if accounts > 1 2014-02-15 13:55:28 +01:00
Sebastian Grewe
7c4ec2f042 Merge pull request #1754 from MPOS/csrf-validation 
[FIX] Use session ID for user uniqueness
 2014-02-15 09:30:31 +01:00
Sebastian Grewe
bd561ff465 [FIX] Statistics Graphs ACL 
Fixes #1760
 2014-02-15 09:27:38 +01:00
iAmShorty
b0baa29a1f [FIX] fix for negative balance 
using php abs() should do the trick with negative balance
 2014-02-14 21:03:30 +01:00
iAmShorty
691e1e60cb Update bitcoinwrapper.class.php 2014-02-14 20:49:42 +01:00
Sebastian Grewe
6f1f56abb6 [ADDED] getrealbalance wrapper for payouts 
During payouts, we must ensure our wallets main accounts has the funds
to payout users. Hence we implement a wrapper method:

* If account count == 1 we only have main account, return getbalance
* Else return our main accounts balance - calculated unconfirmed

This should keep getbalance untouched when used on other places but
gives our payout processing a proper main account balance.

It's mostly a wrapper for those wallets running multiple accounts in one
wallet. They are warned on the front-end already but this ensure payouts
process properly.

Fixes #1755 once merged.
 2014-02-14 17:21:52 +01:00
iAmShorty
0ef5fdedef [UPDATE] small changes 2014-02-14 17:08:22 +01:00
Sebastian Grewe
cb85e266be [FIX] Use session ID for user uniqueness 2014-02-14 14:16:36 +01:00
Sebastian Grewe
8f4af5b038 [REMOVED] Liquid payout cron from monitoring pages 2014-02-14 11:40:50 +01:00
Sebastian Grewe
a083b1c272 [REMOVED] Liquid Payout cron due to issues 
Payouts did not work very well and caused more issues for pools than
being worth having this cron. We revert this and let them use
sendtoaddress again whenever they wish to deduct payouts from their pool
at their own discretion.

We may add this thing back in sometime later with a proper and working
implementation but no promises.
 2014-02-14 11:39:11 +01:00
Sebastian Grewe
d7f2e6e5ac [UPDATE] ACL Management 
* [ADDED] Smarty acl_check function
* [ADDED] Optional default return  value for getValue calls
* [UPDATE] ACL Checks in page controllers
* [UPDATE] Navigation template to use check_acl from Smarty
* [ADDED] New ACL options where needed
* [REMOVED] Disable pages from System Settings Tab
* [ADDED] Above removed pages into ACL Settings Tab

This will make usage of ACLs a bit easier and transparent.
Also fixes #1731 once merged.
 2014-02-14 10:56:25 +01:00