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

2160 Commits

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