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

1183 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
iAmShorty
20374a1eac [UPDATE] changed template 2014-02-26 09:35:50 +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
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
iAmShorty
fbdd811d7f [UPDATE] added top inviter, some code cleanup 2014-02-24 10:39:09 +01:00
Nathan Patten
0c064d4d58 Update default.tpl 2014-02-24 20:28:49 +11:00
Nathan Patten
3ea023e6e0 Blah 2014-02-24 20:21:27 +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
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
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
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
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
Sebastian Grewe
85f985060b Merge pull request #1766 from rog1121/notification-fix 
Notifications Fix
 2014-02-16 14:50:38 +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
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
iAmShorty
2acf83894d only show new table if accounts > 1 2014-02-15 13:55:28 +01:00
Sebastian Grewe
bd561ff465 [FIX] Statistics Graphs ACL 
Fixes #1760
 2014-02-15 09:27:38 +01:00
iAmShorty
0ef5fdedef [UPDATE] small changes 2014-02-14 17:08:22 +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
Andy Mornes
ac3bea9f1a [FIX] Correcting user ID for new block emails 
Also adding the currency to the notifications as well.
 2014-02-13 13:26:48 -06:00
iAmShorty
1fd7499856 [UPDATE] style changes 2014-02-13 17:28:47 +01:00
iAmShorty
224af2c9d3 [UPDATE] showing accounts with balance and address 2014-02-13 16:29:33 +01:00
iAmShorty
81b8b976d1 [FEATURE] show addresses from account 2014-02-13 12:29:04 +01:00
iAmShorty
146799d163 [FEATURE] show addresses from account 2014-02-13 12:28:26 +01:00
Andy Mornes
caee4a7c8f Consolidating the nocache tags 2014-02-12 00:27:21 -06:00
Andy Mornes
91a57903ce New Block Notification additions 
Adding the block number, finder, amount, and difficulty to the new block
notification email
 2014-02-12 00:18:00 -06:00
Sebastian Grewe
6509cc6039 [ADDE] CSRF validation for Worker Deletion 
* [ADDED] CSRF token checks to worker page
* [CHANGED] Check for both _GET and _POST ctokens
* [ADDED] CSRF token to each delete call URL

Fixes #1702 once merged
 2014-02-07 12:24:48 +01:00
Sebastian Grewe
7cf3fb27fb [UPDATE] Allow global notification settings 
Fixes #1232 and allows further expansion in the future.
Addresses #1672 too.
 2014-02-06 11:13:22 +01:00
Sebastian Grewe
7673c34d80 Merge branch 'fix-contactform' into next 2014-02-06 10:57:49 +01:00
Sebastian Grewe
5196cc7448 [UPDATE] Highlight next/previous arrows on admin/user 2014-02-06 10:56:19 +01:00
Sebastian Grewe
2f1d68448f [FIX] CSRF/Re-captcha on Contactform 
Fixes #1666
 2014-02-06 10:19:58 +01:00
Sebastian Grewe
bc0d340bf3 Merge pull request #1642 from MPOS/payout-overhaul 
[IMPROVED] Payout logics
 2014-02-04 21:59:22 -08:00
Sebastian Grewe
c00b6d6757 [IMPROVED] Payout logics 
* [ADDED] More methods to our transaction class
 * `createDebitAPRecord` and `createDebitMPRecord`, will handle the
 * entire debit process
  * Adds Debit transaction
  * Adds TXFee transaction
  * mark transactions as archived
  * validate user is fully paid out
  * send notification to user
 * `getMPQueue` was added to unify the process of getting payout queues
* [MOVED] Only one mail template for both payout methods
* [ADDED] Some minor calls to user class
* [ADDED] Full address validation to bitcoin class
* [SQL] New SQL upgrade and Version Increment
 * Adding UNIQUE index to coin_address in accounts table
 * preperation for `sendmany` implementation
 2014-02-03 08:16:58 +01:00
HerrKauwer
70e8b27085 Used zxcvbn for password strength determination 2014-02-02 15:04:55 +01:00
Sebastian Grewe
319d9439a4 Merge pull request #1621 from xisi/sessions-mclimiter-fixes 
[UPDATE] Security updates and fixes
 2014-01-31 05:55:09 -08:00
Yefta Sutanto
0bd1606207 Update sidebar_prop.tpl 
Fixing "Your Invalid" percentage calculation
 2014-01-30 00:17:20 +07:00
Yefta Sutanto
0a9398b99e Update sidebar_pps.tpl 2014-01-30 00:16:45 +07:00
Yefta Sutanto
016da6cd61 Update sidebar_pplns.tpl 
Fixing "Your Invalid" percentage calculation
 2014-01-30 00:12:34 +07:00
xisi
ae47437ab7 fixed worker delete csrf thing I stubbed earlier 
took to field out of the rest of the login forms
 2014-01-29 09:41:50 -05:00
Zen00
0e8949c71d Linked Site-Title 
Seems that there was plans to make the site title a link, but the .tpl
was never updated.
 2014-01-28 08:16:31 -07:00
xisi
6398e5dfec merged session manager/memcache limiter 
cleanup for PR
 2014-01-28 07:26:33 -05:00
xisi
b728b680ca blah blah 2014-01-28 07:26:08 -05:00
Sebastian Grewe
5f65904431 [FIX] HTTPS detecion on Template 2014-01-28 09:25:50 +01:00
Sebastian Grewe
768d193793 Merge pull request #1576 from xisi/csrf-backend-only 
[FIXES] More CSRF improvements
 2014-01-25 06:59:08 -08:00
xisi
8fbda49fd1 Don't even need the suppression 2014-01-24 16:33:55 -05:00
xisi
a043e5ed19 Fixes #1561, which happened to me even with the API key in the correct format 2014-01-24 16:32:00 -05:00
xisi
3006cb544f Reworked csrf tokens, now enabled globally 
The way this now works is, if csrf is enabled:
 * Any new or existing template can have csrf protection by adding the hidden input ctoken that's in this batch to its form, removes any logic in templates
 * Page controllers that already exist have been updated, new ones only require checking if csrf is enabled and valid
 2014-01-24 13:00:24 -05:00
Sebastian Grewe
70a09811ec [FIX] PHP Notice on Mobile Template 2014-01-24 11:29:19 +01:00
Sebastian Grewe
a1a3d7e873 [IMPROVED] Added donation minimum and rounding 
* [ADDED] Config option `$config['donate_threshold']['min'] = 1;`
* [VERSION] Incremented config file version to `0.0.6`
* [CHANGED] Round donations to at least two digits
* [CHANGED] Honor minimum set pool donation percentage
* [UPDATED] Account edit template

Fixes #1475 once merged
 2014-01-24 10:06:13 +01:00
xisi
1fd0adf038 Removed unused config setting 2014-01-23 11:01:30 -05:00
Sebastian Grewe
4b04df5d8a [FIX] Allow TAB to focus on email login 2014-01-23 10:11:37 +01:00
Sebastian Grewe
0d10079a2a [FIX] remove mail debug output 2014-01-22 12:48:03 +01:00
Sebastian Grewe
3b13ea4990 [FIX] Properly show login details on mail notif. 
Fixes #1530 once merged
 2014-01-22 11:14:50 +01:00
nrpatten
151decb2b6 [FIX] Align Checkbox 
"Edit template" checkbox align closer to "Active"
 2014-01-22 00:39:42 +11:00
nrpatten
fc7a939b1e [FIX] Update github footer link 
Remove https://github.com/TheSerapher/php-mpos
Add https://github.com/MPOS/php-mpos
 2014-01-21 23:42:58 +11:00
Sebastian Grewe
bf484c4be2 Merge pull request #1510 from xisi/security-pagecontrollerfix 
Fix issue #1508
 2014-01-21 03:20:38 -08:00
nrpatten
6b938a66d2 [FIX] Unknown Pool Footer 
Remove <p>{$GLOBAL.website.name|default:"Unknown Pool"}</p>
Add <p>{$WEBSITENAME}</p>
 2014-01-21 20:50:29 +11:00
nrpatten
dfd4d57361 [FIX] Unknown Pool 
Remove <p>{$GLOBAL.website.name|default:"Unknown Pool"}</p>
Add <p>{$WEBSITENAME}</p>
 2014-01-21 20:49:42 +11:00
nrpatten
35d6317ec2 [FIX] Unknown Pool Footer 
Remove <p>{$GLOBAL.website.name|default:"Unknown Pool"}</p>
Add <p>{$WEBSITENAME}</p>
 2014-01-21 20:48:48 +11:00
nrpatten
1c07abb2c0 [FIX] Unknown Pool Footer 
Remove <p>{$GLOBAL.website.name|default:"Unknown Pool"}</p>
Add <p>{$WEBSITENAME}</p>
 2014-01-21 20:47:37 +11:00
xisi
ac91d70c5f This should fix issue #1508 2014-01-21 04:04:53 -05:00
Sebastian Grewe
2d760c2934 Merge pull request #1504 from daygle/patch-6 
Update default.tpl
 2014-01-21 01:00:00 -08:00
Sebastian Grewe
9520795e07 Merge pull request #1506 from nrpatten/next 
[FIX] input[type=email] in the wrong order and Overlap and Reposition TABS
 2014-01-21 00:07:58 -08:00
Sebastian Grewe
0edd964930 Merge pull request #1507 from xisi/security-js-pwstrength 
Simple javascript password strength/match
 2014-01-21 00:04:18 -08:00
nrpatten
0cfc92bd2b [FIX] Overlap and Reposition TABS 
[FIX] "E-mail address for system error" Overlap and realign class="tabs" to fieldset
 2014-01-21 17:12:06 +11:00
xisi
a20c2324e2 Added pw strength/match to change password form 2014-01-21 00:02:57 -05:00
xisi
b0053b65e1 Added basic javascript password strength/match testing 
Added pw strength/match to registration form
 2014-01-20 23:57:07 -05:00
Glen
3a43ed4e42 Update default.tpl 
Getting started page modification suggestions for all users.

1. Add BFGMiner details.
2. Remove bullet points for steps.
3. Add additional line for BFGMiner command line.
 2014-01-21 14:38:10 +11:00
rog1121
0a6ab8748b Mail Titles 2014-01-20 09:33:21 -07:00
Sebastian Grewe
eb6692b31c Merge pull request #1481 from raistlinthewiz/next 
tx fee's shouldn't be %
 2014-01-20 07:46:45 -08:00
Hüseyin Uslu
51d0879f8d Wording fix for index.php?page=account&action=edit - tx fee's shouldn't be % 2014-01-20 17:44:45 +02:00
xisi
ffda9dbae1 rebase + fix bug in overview tpl that could throw a notice 2014-01-20 04:53:00 -05:00
xisi
fd49e0eb78 disabled is actually correct to use in cash out form, we want the css props 
slightly optimization
 2014-01-20 04:41:13 -05:00
xisi
a987878c8e removed extraneous disabling of a field in edit account page, thanks @rog1121 2014-01-20 04:41:13 -05:00
xisi
b0413226b4 removed extraneous disabling of a field in edit account page, thanks @rog1121 2014-01-20 04:41:13 -05:00
xisi
76a67cb71a Changed the config options for CSRF/disabling forms 
* Now an array to disable with granularity
 * Fixed all CSRF tokens back to 1 min
 * Added CSRF protection for unlock account
 * Unified error message for all csrf tokens
 * Fixed a few issues with last commit
 2014-01-20 04:41:13 -05:00
xisi
bd2999526e fixed mobile templates, have not tested as they use same methods as main template 
fixed change pw templates; added csrf token
added csrf protection for password reset
fixed reset and change pass templates; were missing csrf token (form only tpl)
 2014-01-20 04:40:38 -05:00
xisi
15eca659b9 fixed a bug in edit account template 
moved csrf token to above template in smarty assigns
fixed a bug in user class
remove small login/fix header to catch up
 2014-01-20 04:30:17 -05:00
xisi
8756036646 cleaned up account edit csrf slightly 
added csrf protection to workers under sitewide config
added csrf protection to notifications under sitewide config
added csrf protection to invitations under sitewide config
cleaned up login page csrf
cleaned up contactform/contactform page
cleaned up register/register page
moved config->csrf->forms->register to sitewide
added login ip/user/time to notification on login
 2014-01-20 04:29:45 -05:00
xisi
e5c9720174 Finished cleanup of account edit page 
added csrf protection to account edit page under sitewide config
escaped all instances of CTOKEN for csrf in smarty templates
 2014-01-20 04:29:13 -05:00
xisi
d83542e03e Added method to get description image of csrf token with name 
moved sitewide into options portion of the config option
csrf protection for contact form under sitewide config option
changed register to 1 hour token
 2014-01-20 04:27:58 -05:00
xisi
58529547e0 Cleaned up logic of login page csrf protection 
added csrf protection to register page
 2014-01-20 04:27:22 -05:00
xisi
6afc876d19 Merge changes from TheSerapher's pull/1404 Added re-Captcha to Login Page 2014-01-20 04:26:04 -05:00
rog1121
77a0287c7f Update default.tpl 2014-01-19 12:37:54 -07:00
Metice
e665552c05 Update default.tpl 
Remove username of placeholder
 2014-01-19 15:01:11 +01:00
Sebastian Grewe
48a344ed25 [SECURITY] Dropped small login form 
Since we are adding more security realted features, we drop the small
login in the header. It will need more workarounds than we'd like and is
already dropped when re-Captcha is enabled.

Security > Convenience :D
 2014-01-17 15:43:58 +01:00
Jesse Collier
bc833eb40b [IMPROVED] Adds Email label and removes maxlength 
When logging in from mobile, there currently is not an indicater to
use email or username. This labels it correctly.

Removed maxlength to allow for lengthier email addresses.
 2014-01-16 14:42:05 +01:00
Sebastian Grewe
2829f6a746 [IMPROVED] Dropped username from login 2014-01-16 14:40:51 +01:00
Sebastian Grewe
63f062af9d [UPDATE] CSRF to Mobile template 2014-01-16 14:33:04 +01:00
Sebastian Grewe
bef4298e1f [ADDED] Default re-Captcha HTML to mobile 2014-01-16 14:14:29 +01:00
Sebastian Grewe
d5bff56f6f [ADDED] re-Captha admin options 2014-01-16 14:14:29 +01:00
Sebastian Grewe
b9d36bcfc9 [IMPROVED] Added re-Captcha to Login Page 
* Enable re-captcha to use it
* Disables the mini-login box in header
* Requires re-Captcha to be setup in Admin Panel

Fixes #1400 once merged.
 2014-01-16 14:13:50 +01:00
xisi
b613182dfb what fix, nothing to see here 2014-01-16 05:55:57 -05:00
xisi
2d0938b35b [ADDED] Simple CSRF protection tokens 
* Adds config options for disabling, timeout lead time, and forms
 * Adds another salt in config that's used in the token
 * Adds protection for login form by default
 2014-01-16 05:55:57 -05:00
xisi
bae30b2e4f fixed success_login tpl verbiage 2014-01-16 05:55:57 -05:00
xisi
9d14902bb5 fix nocache in account/edit template 2014-01-16 05:55:57 -05:00