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

2557 Commits

Author SHA1 Message Date
Glen
c3e0c383b6 Update reset.tpl 2014-04-27 23:30:19 +10:00
Glen
26b17d40ec Update body.tpl 2014-04-27 23:29:25 +10:00
Glen
ba696f7c90 Update withdraw_funds.tpl 2014-04-27 23:28:28 +10:00
Glen
24807e4d4f Update locked.tpl 2014-04-27 23:27:36 +10:00
Glen
0ee8cb63db Update change_pw.tpl 2014-04-27 23:26:52 +10:00
Glen
1f4fb5f7b1 Update account_edit.tpl 2014-04-27 23:25:07 +10:00
Sebastian Grewe
79529c0d2a [ADDED] Online version checks 2014-04-25 15:40:07 +02:00
Sebastian Grewe
43bf7be200 [FIX] Merge conflict with development 2014-04-24 11:43:38 +02:00
Sebastian Grewe
78e7eccad9 Merge pull request #2131 from MPOS/timezone-support 
[ADDED] Timezone support
 2014-04-24 11:36:15 +02:00
Boris
4e1855c375 [Fix] Correctly hash new password 2014-04-23 17:41:42 +01:00
Sebastian Grewe
02cf3ad573 Merge pull request #2137 from iAmShorty/motd-resize 
[UPDATE] resize motd in settings
 2014-04-23 18:09:20 +02:00
iAmShorty
72e3a5836d [UPDATE] resize motd in settings 2014-04-23 17:18:06 +02:00
iAmShorty
0977c0d669 [UPDATE] jquery to version 2.1.0 2014-04-23 17:07:08 +02:00
Sebastian Grewe
0a502b2487 [REMOVED] Old select box for timezones 2014-04-23 11:09:04 +02:00
Sebastian Grewe
97225fdf1e [FIX] Merge conflict 2014-04-23 10:46:33 +02:00
Sebastian Grewe
2bcc48937f [FIX] Re-new timezone on account update 2014-04-23 10:35:17 +02:00
Sebastian Grewe
440d0bad17 [ADDED] Timezone support for user accounts 2014-04-23 10:35:17 +02:00
Sebastian Grewe
d84e54983a Merge pull request #2135 from MPOS/hashing-improvements 
Hashing improvements
 2014-04-23 10:24:22 +02:00
Sebastian Grewe
b37aa821ed [FIX] HTTP(s) Detection on Mail Templates 2014-04-23 10:18:58 +02:00
Sebastian Grewe
22df492d7c [ADDED] HASH_VERSION for easier hash upgrades 2014-04-20 18:38:24 +02:00
Sebastian Grewe
7ffb6ad484 [ADDED] Upgrades hashes after pin/password update 2014-04-20 18:18:45 +02:00
Sebastian Grewe
4cac2ce3b4 [IMPROVED] Versioned password hashing support 
Addresses #2047
 2014-04-20 17:08:13 +02:00
Sebastian Grewe
8a2fb4c659 [UPDATE] htaccess for docroot 2014-04-20 15:34:55 +02:00
Sebastian Grewe
1456bd21ef [MOVED] Removed include and templates from public [TESTING] 2014-04-20 15:34:55 +02:00
Glen
10bea9db88 Add Smarts To About/FAQ Page 
Add smarts to the about/FAQ page to display/hide appropriate questions/answers.
 2014-04-20 09:10:39 +10:00
Nathan Patten
1c95a0c95c [FIX] questionmark.png Path 2014-04-19 23:20:10 +10:00
Nathan Patten
899d2134eb [FIX] questionmark.png Path 2014-04-19 23:18:54 +10:00
Sebastian Grewe
53a20e649a Merge branch 'development' of https://github.com/MPOS/php-mpos into development 2014-04-19 08:06:33 +02:00
Sebastian Grewe
1e1bbaaa92 [FIX] PHP Notice 2014-04-19 08:06:26 +02:00
Sebastian Grewe
5da9e12f11 Merge pull request #2124 from iAmShorty/cleaner-adminmenu 
[UPDATE] cleaner navigation in admin menu
 2014-04-19 08:05:44 +02:00
Glen
f9b8a45223 Corrected IF Statement End 
Sorry just realised if statement was incorrect in my last push - corrected here.
 2014-04-18 00:52:37 +10:00
Glen
08ca41d451 Remove MEGA Crap From Getting Started 
What's the go with all the MEGA references? - talk about a way of promoting MEGA? I have removed all references and replaced with reputable links where possible except the CGMiner 3.7.2 download link - I'll try and find a better one and update later.

Reason for this change is because MEGA is prompting users to download the application/join the site.
 2014-04-18 00:27:57 +10:00
iAmShorty
91db296aec [UPDATE] cleaner navigation in admin menu 2014-04-17 11:18:43 +02:00
Sebastian Grewe
da5414d5b5 [FIX] Proper default format 2014-04-17 06:53:46 +02:00
Sebastian Grewe
1a97f41f52 [ADDED] System Date Format string 
* [ADDED] New admin panel config option in System
* [UPDATED] Use new date format on all templates

Fixes #2118 once merged.
 2014-04-17 06:49:19 +02:00
Sebastian Grewe
a7393f0a81 Merge pull request #2121 from daygle/patch-3 
Scrypt/SHA256 Friendly Changes (Getting Started)
 2014-04-17 06:16:00 +02:00
Sebastian Grewe
1a706436a2 Merge pull request #2120 from daygle/patch-2 
Hide Point 5 In Getting Started - SHA256 Coins
 2014-04-17 06:14:33 +02:00
Glen
05d4a8925f Scrypt/SHA256 Friendly Changes (Getting Started) 
Correctly display miner download links depending on coin used scrypt/SHA256.
 2014-04-17 11:20:22 +10:00
Glen
cc645d24c5 Hide Point 5 In Getting Started - SHA256 Coins 
Hide irrelevant details in point 5 when SHA256 coin is used.
 2014-04-17 11:05:45 +10:00
Glen
4b2dd64ff9 Update default.tpl 
Corrected spacing when --script is omitted.
 2014-04-17 10:42:45 +10:00
Sebastian Grewe
16a1ca641a [ADDED] Worker totals on Dashboard 
* Added worker hashrate sum
* Added refresh interval information to dashboard footer
* Added number formatting to hashrate
 2014-04-16 22:15:34 +02:00
Sebastian Grewe
43a362afab [CLEANUP] Use coin class for worker hashrate calcs 
* Worker class was not using coin class for calculations
* Should improve runtime for worker status related queries
 2014-04-16 21:41:41 +02:00
Sebastian Grewe
554742c139 [SECURITY] Fixed 2FA on the account edit page 
* Fixes 2FA Tokens on the account page
* 2FA was skipped until now :-/

No open ticket for this, reported by dev.
 2014-04-16 19:32:49 +02:00
Sebastian Grewe
a5fe6236e1 [SECURITY] Removed SQL Templates 
* Remove the entire SQL template system
* Secuirty issues arose that can't easily be fixed in MPOS
* For the sake of site security, these have been completely removed

! Will require the `templates/cache/bootstrap` and `template/compile/bootstrap`
folders to be removed if custom SQL templates were used !

Will fix #2114 once merged.
 2014-04-16 19:02:28 +02:00
Sebastian Grewe
54a1452d45 [ADDED] User Details page for admins 2014-04-11 16:33:00 +02:00
Sebastian Grewe
233c0c7e8a [VERSION] Config file version check 2014-04-11 12:44:35 +02:00
Sebastian Grewe
2fdf94c9c5 [VERSION] Config 0.0.8 due to typos 2014-04-11 12:41:34 +02:00
Sebastian Grewe
cfe1caa643 [CLEANUP] Fixed Typos 2014-04-11 12:41:05 +02:00
Sebastian Grewe
e8488215bc [CLEAN] Array formatting 2014-04-11 09:01:32 +02:00
Hüseyin Uslu
722642f39c Merge branch 'development' of https://github.com/MPOS/php-mpos into development 2014-04-10 13:34:31 +03:00
Hüseyin Uslu
320b26d058 fixed php warnings in api/getpoolinfo 2014-04-10 13:33:18 +03:00
Sebastian Grewe
827f5cebe2 Merge branch 'development' of https://github.com/MPOS/php-mpos into development 2014-04-08 16:46:26 +02:00
Sebastian Grewe
a064326bed [DELETE] MPOS site assets 2014-04-08 16:46:17 +02:00
Sebastian Grewe
faf241f48e [DELETE] Deprecated MPOS theme for 1.0.0 2014-04-08 16:41:35 +02:00
Boris
43c3239b0a Reword T&C's last point as points are no longer numbered. 2014-04-07 11:03:59 +01:00
iAmShorty
be83880e1d [FIX] firefox bug 
aligning the dropdowns
 2014-04-07 11:48:37 +02:00
Sebastian Grewe
0677321259 [CLEANUP] Use of isset instead of @ 2014-04-07 09:55:02 +02:00
Sebastian Grewe
870ad52985 [FIX] PHP Notice on failed crons 2014-04-06 17:31:42 +02:00
Sebastian Grewe
7e38b98e8f [FIX] Unset website email, mail issues 2014-04-06 10:05:08 +02:00
Sebastian Grewe
5e0faa6e7a Merge pull request #2095 from brettcannon/patch-2 
Typo: "paypout" -> "payout"
 2014-04-06 01:03:02 +02:00
Brett Cannon
b2a189c3f0 Typo: "paypout" -> "payout" 2014-04-05 18:13:14 -04:00
Brett Cannon
73137ac6e0 Typo: "paypout" -> "payout" 2014-04-05 18:12:44 -04:00
iAmShorty
601c3943fb [UPDATE] move donors to stats 2014-04-05 08:58:49 +02:00
Sebastian Grewe
017dd5bc82 Merge pull request #2088 from MPOS/pool-newsletter 
Pool newsletter
 2014-04-04 13:52:13 +02:00
Sebastian Grewe
f54ece7ee9 [FIX] Return defaults with no settings at all 2014-04-04 12:51:15 +02:00
Sebastian Grewe
022430dddb [FIX] Logic error for notification setting 2014-04-04 12:26:08 +02:00
Sebastian Grewe
37f50256ab Merge branch 'development' of https://github.com/MPOS/php-mpos into development 2014-04-04 10:34:55 +02:00
Sebastian Grewe
ae7d321de4 [FIX] Merge conflict 2014-04-04 10:34:04 +02:00
iAmShorty
22e9a62d4e [UPDATE] style fixes 2014-04-04 10:30:14 +02:00
iAmShorty
37cdadbabc rollback 2014-04-04 10:28:49 +02:00
Sebastian Grewe
0b54cac402 Merge pull request #2085 from barrybingo/development 
[FIX] Remove static table references
 2014-04-04 10:26:32 +02:00
Sebastian Grewe
e1be46b6eb [FIX] Skip locked accounts 2014-04-04 10:25:35 +02:00
iAmShorty
3b26d455c2 rebase 2014-04-04 10:25:00 +02:00
Sebastian Grewe
739f035087 [ADDED] Admin Pool Newsletter 
* Added throttle option to swiftmailer for SMTP limiting
* Added newsletter page for admin panel
* Added newsletter mail template (simple one for now)
* Added new global configuration option
* Added default notification setting system in notification class
* Added global pool newsletter enable/disable switch in admin settings

Fixes #2087 once merged.
 2014-04-04 10:05:12 +02:00
iAmShorty
8b6f291384 [UPDATE] hide/show qrcode page 2014-04-03 16:25:31 +02:00
Boris
4702339b9a [FIX] Remove static table references 2014-04-03 14:52:01 +01:00
iAmShorty
88aa40351b [FIX] typo 2014-04-02 17:37:02 +02:00
iAmShorty
68d87633e2 [FIX] updated styles, typos and colors 2014-04-02 17:35:56 +02:00
iAmShorty
3986a24d86 [FIX] number format in block overview 2014-04-02 15:56:26 +02:00
iAmShorty
040e2baa35 [FIX] responsive tables 2014-04-02 15:10:58 +02:00
iAmShorty
4527d4793d [UPDATE] delete cookies on login 2014-04-02 13:47:25 +02:00
iAmShorty
477ed0884d [FIX] notification popup fix 2014-04-02 13:32:23 +02:00
Sebastian Grewe
7ef96312bf [CHANGE] Use n/a for estimates on 0 net hashrate 2014-04-02 10:46:59 +02:00
Sebastian Grewe
7a87c09056 [FIX] Devision by 0 on missing nethashrate 2014-04-02 10:46:30 +02:00
iAmShorty
09b303fa49 [FIX] typo 2014-04-01 00:05:18 +02:00
iAmShorty
a1e8c08808 Update default.tpl 2014-03-31 23:58:46 +02:00
iAmShorty
a9aedbf603 Update default.tpl 2014-03-31 23:56:53 +02:00
iAmShorty
5edb15a834 Update green.css 2014-03-31 23:53:11 +02:00
iAmShorty
f2588e043c Update blue.css 2014-03-31 23:52:44 +02:00
iAmShorty
1385e4ea5a Update dark.css 2014-03-31 23:51:59 +02:00
iAmShorty
9f6bbbc086 [UPDATE] Header title 2014-03-31 22:53:37 +02:00
iAmShorty
0c75662352 [UPDATE] adding moot 2014-03-31 16:19:56 +02:00
Sebastian Grewe
6ce8a049e4 [FIX] Est. next diff with 0 hashrate 2014-03-31 15:49:38 +02:00
Nathan Patten
fc94ec4df7 [FIX] Issue #2064 2014-03-31 18:58:31 +11:00
Nathan Patten
314eb10381 [FIX] Issue #2064 2014-03-31 18:56:35 +11:00
Nathan Patten
116fff9d14 [EDIT] Add progress for MPOS-Bot to API call 2014-03-31 18:41:41 +11:00
Sebastian Grewe
d7d364c90d [FIX] PPS Value after Ajax Refresh 2014-03-31 09:08:56 +02:00
Sebastian Grewe
5061386fb8 Merge pull request #2062 from SamuelNZ/development 
Removing Some Inline CSS
 2014-03-31 07:57:52 +02:00
SamuelNZ
828ebdf7fa [UPDATE] Syntax 2014-03-31 16:19:17 +13:00
SamuelNZ
981862a0de [UPDATE] Syntax 2014-03-31 16:18:33 +13:00