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

2136 Commits

Author SHA1 Message Date
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
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