Commit Graph

3518 Commits

Author SHA1 Message Date
Sebastian Grewe
1456bd21ef [MOVED] Removed include and templates from public [TESTING] 2014-04-20 15:34:55 +02:00
Sebastian Grewe
540a99abc5 Merge pull request #2129 from daygle/patch-6
Add Smarts To About/FAQ Page
2014-04-20 07:43:11 +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
Sebastian Grewe
d69e25427f Merge pull request #2126 from daygle/patch-5
Corrected IF Statement End
2014-04-17 18:01:13 +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
Sebastian Grewe
de00cc461c Merge pull request #2125 from daygle/patch-4
Remove MEGA Crap From Getting Started
2014-04-17 16:33:02 +02: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
47f46ee73c Merge pull request #2122 from MPOS/date-format
[ADDED] System Date format
2014-04-17 06:56:23 +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
Sebastian Grewe
55915ad48f Merge pull request #2119 from daygle/patch-1
Update default.tpl
2014-04-17 06:14:09 +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
6324471bdf Merge pull request #2109 from Oeldin/patch-1
[Added] my WP8 app
2014-04-14 18:27:45 +02:00
Oeldin
943e4a4809 [Added] my WP8 app
I added my Windows Phone App to the list of related software. It uses the API to display various stats.
2014-04-14 17:42:54 +02:00
Sebastian Grewe
2c642c223a [ADDED] Help option 2014-04-14 11:10:17 +02:00
Sebastian Grewe
1550553a6d [ADDED] Validate all users option 2014-04-14 10:57:55 +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
Sebastian Grewe
190bf86de8 Merge pull request #2105 from raistlinthewiz/development
Fixed php warnings caused by api/getpoolinfo
2014-04-10 12:55:59 +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
af8e15d4dc Merge pull request #2102 from MPOS/drop-mpos-theme
[DELETE] Deprecated MPOS theme for 1.0.0
2014-04-08 16:45:43 +02:00
Sebastian Grewe
faf241f48e [DELETE] Deprecated MPOS theme for 1.0.0 2014-04-08 16:41:35 +02:00
Sebastian Grewe
5907f34e10 Merge pull request #2098 from barrybingo/development
Reword T&C's last point as points are no longer numbered.
2014-04-07 12:15:55 +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
166c44fd89 Merge branch 'development' of https://github.com/MPOS/php-mpos into development 2014-04-06 17:31:47 +02:00
Sebastian Grewe
870ad52985 [FIX] PHP Notice on failed crons 2014-04-06 17:31:42 +02:00
Sebastian Grewe
d49c2ff9b7 Merge pull request #2097 from iAmShorty/cronjob-php-notice
[FIX] PHP notice in cronjob
2014-04-06 17:29:29 +02:00
iAmShorty
a8d633e7ba [FIX] PHP notice in cronjob 2014-04-06 17:05:59 +02:00