Commit Graph

3365 Commits

Author SHA1 Message Date
iAmShorty
5866cbb54d [UPDATE] changed link behavior 2014-03-23 00:37:55 +01:00
iAmShorty
bd4096bccb [UPDATE] added exchange url to price ticker 2014-03-22 21:12:55 +01:00
Sebastian Grewe
5b4727479f Merge branch 'development' into bootstrap 2014-03-22 14:39:49 +01:00
Sebastian Grewe
ad1db8dfca [FIX] Same for PPLNS Archive shares 2014-03-22 14:39:38 +01:00
Sebastian Grewe
441e71857a Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap 2014-03-22 14:26:33 +01:00
Sebastian Grewe
af3b0487b1 Merge branch 'development' into bootstrap 2014-03-22 14:26:23 +01:00
Sebastian Grewe
be50e8ab47 [FIX] Remove baseline conversion from PPLNS Targets 2014-03-22 14:26:12 +01:00
nrpatten
948fe892eb [FIX] More Style Margin 2014-03-22 05:12:36 -07:00
nrpatten
0aa75bd1d4 [FIX] More Style Margin 2014-03-22 05:11:41 -07:00
nrpatten
bfd0302782 [FIX] Style Margin 2014-03-22 05:03:29 -07:00
SamuelNZ
aa63eac2ea Update global.inc.dist.php
Double vision
2014-03-23 00:45:43 +13:00
iAmShorty
8ebecb7f54 Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into development 2014-03-22 12:33:18 +01:00
iAmShorty
ca163a4fde [UPDATE] style fixes 2014-03-22 12:31:56 +01:00
iAmShorty
bd57e048e6 [UPDATE] style fixes 2014-03-22 12:31:37 +01:00
iAmShorty
dd4beaecaf [UPDATE] style fixes 2014-03-22 12:28:27 +01:00
iAmShorty
f76b2d564c Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into development 2014-03-22 11:17:36 +01:00
nrpatten
cddb929e22 [FIX] HTML Fixes 2014-03-22 02:39:40 -07:00
nrpatten
7350178f48 [UPDATE] Pool Info Without Price 2014-03-22 02:21:07 -07:00
nrpatten
f0e0bf27a9 [UPDATE] Overview Icons 2014-03-22 02:03:32 -07:00
nrpatten
3e6854095e New Test Setout Round Props 2014-03-22 01:12:59 -07:00
nrpatten
02c70740ed New Test Setout Round Props 2014-03-22 01:12:22 -07:00
SamuelNZ
51b7cbdbee Update mpos.css
Third time is the charm.
Added width constraint, Things can't display correctly otherwise (Alerts for instance)
Commented out the margin-left that was causing a issue similar to the dropdown-user
2014-03-22 20:57:59 +13:00
Sebastian Grewe
b0fdb62c12 [LAYOUT] Blocks Stats page 2014-03-22 08:32:25 +01:00
nrpatten
20130b44a1 New Test Setout Round Stats Readd 2014-03-22 00:20:58 -07:00
nrpatten
f3f12d357c New Test Setout Round Stats 2014-03-22 00:15:56 -07:00
nrpatten
fd5591fbc4 New Test Setout 2014-03-22 00:09:37 -07:00
Sebastian Grewe
f9c57e8ca9 Merge pull request #1987 from SamuelNZ/patch-3
Update bootstrap.min.css
2014-03-22 08:01:09 +01:00
Sebastian Grewe
a00b84721a [DRAFT] PPS Dashboard 2014-03-22 07:36:13 +01:00
Sebastian Grewe
828481b235 [FIX] Worker Info Responsive 2014-03-22 07:20:51 +01:00
SamuelNZ
f78b20f108 Update mpos.css
Makes more sense to change this actually.
2014-03-22 16:12:22 +13:00
SamuelNZ
39da07462b Update mpos.css
Add changes here instead as suggested.
2014-03-22 16:06:34 +13:00
SamuelNZ
049d3bea28 Update bootstrap.min.css
Reverted Changes
2014-03-22 16:05:32 +13:00
SamuelNZ
1634d0acdd Update bootstrap.min.css
Changed min-wdth of drop down menu too 100px
160px is too wide for when the template is in the smaller resolutions and has the user detail on the left, and it "falls off" the screen.
2014-03-22 14:57:47 +13:00
iAmShorty
81fe0cf38a Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into development 2014-03-22 00:37:10 +01:00
Sebastian Grewe
3ec6248916 Merge branch 'development' into bootstrap 2014-03-21 18:29:58 +01:00
Sebastian Grewe
7945b87213 [FIX] 0.0.8 Upgrade SQL 2014-03-21 18:28:12 +01:00
Sebastian Grewe
3223e40cc6 [FIXED] Charset on payouts table, non-critical 2014-03-21 16:05:59 +01:00
Sebastian Grewe
5841eb458e Merge branch 'development' into bootstrap 2014-03-21 16:01:03 +01:00
Sebastian Grewe
9a7d9abb70 Merge pull request #1984 from MPOS/drop-baseline-shares
Drop baseline shares
2014-03-21 15:57:17 +01:00
Sebastian Grewe
8b28b25e18 [CHANGE] Moved SQL files into upgrade script 2014-03-21 15:49:30 +01:00
Sebastian Grewe
f9cba03c68 [IMPROVED] Advanced upgrade structure 2014-03-21 15:12:13 +01:00
Sebastian Grewe
bc42963c75 [DEPRECATED] run-crons throws a warning now 2014-03-21 14:06:46 +01:00
Sebastian Grewe
10ad428575 [UPDATED] Logrotate conf 2014-03-21 14:06:31 +01:00
iAmShorty
9a79363aba Merge branch 'drop-baseline-shares' of https://github.com/MPOS/php-mpos into development 2014-03-21 13:00:31 +01:00
Sebastian Grewe
d72b4f6a51 [REMOVED] Baseline from roundstats 2014-03-21 12:56:31 +01:00
Sebastian Grewe
055e4259e1 [REMOVED] Baseline shares from statistics 2014-03-21 12:54:29 +01:00
Sebastian Grewe
1f6ef81b9c [ADDED] SQL Upgrade Script 2014-03-21 12:47:24 +01:00
iAmShorty
d75604d12f Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into development 2014-03-21 12:41:01 +01:00
Sebastian Grewe
67a4713cf0 [REMOVED] Baseline Share calculations
* We now track diff1 shares instead of converting into a baselined value
* PPS has been adjusted to payout shares directly
* Estimated Shares in coin_base adjusted
2014-03-21 11:51:34 +01:00
iAmShorty
fb0dbbd8a1 [FIX] style fixes 2014-03-21 09:04:19 +01:00