Commit Graph

2039 Commits

Author SHA1 Message Date
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
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
Sebastian Grewe
d857a3d85e [FIX] No captcha on contactform if disabled
Fixes #1846 once merged
2014-02-27 11:07:37 +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
bbba9d1daf Merge pull request #1837 from MPOS/unified-user-miningstats
Unified user miningstats
2014-02-26 09:53:41 +01:00
Sebastian Grewe
3e64dd3487 Merge pull request #1798 from MPOS/x-forwarded-for-check
[CHANGED] Parse X-FORWARDED-FOR when supplied
2014-02-26 09:53:29 +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
Sebastian Grewe
d750e81b02 [FIX] Wait for global cache data, don't run queries 2014-02-26 09:42:49 +01:00
iAmShorty
20374a1eac [UPDATE] changed template 2014-02-26 09:35:50 +01:00
Sebastian Grewe
78619c1427 [IMPROVED] Unified user speed statistics
* [ADDED] getUserMiningStats to fetch all speed related data
 * Uses global cache if available, falls back to local query and then
   local caches
* [REMOVED] getUserHashrate, getUserSharerate, getUserAvgShareDifficulty
* [UPDATED] All code occurences for the above to use the new system

Probably won't change much since global cache was already used but does
help on the Dashboard since we combine at least 2 calls into one.
2014-02-26 09:27:32 +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