Merge master to stable

embed.php

@@ -135,6 +135,8 @@
             floatingtime = result.floatingtime,
             yaxismin = result.yaxismin;
             yaxismax = result.yaxismax;
+            yaxismin2 = result.yaxismin2;
+            yaxismax2 = result.yaxismax2;
             feedlist = result.feedlist;
 
             // show settings

group_graph.js

@@ -846,8 +846,8 @@ function graph_draw()
             out += "<td>"+feedlist[z].id+":"+feedlist[z].tag+": "+feedlist[z].name+"</td>";
             var quality = Math.round(100 * (1-(feedlist[z].stats.npointsnull/feedlist[z].stats.npoints)));
             out += "<td>"+quality+"% ("+(feedlist[z].stats.npoints-feedlist[z].stats.npointsnull)+"/"+feedlist[z].stats.npoints+")</td>";
-            out += "<td>"+feedlist[z].stats.minval.toFixed(dp)+"</td>";
-            out += "<td>"+feedlist[z].stats.maxval.toFixed(dp)+"</td>";
+            if(!isNaN(Number(feedlist[z].stats.minval))) out += "<td>"+feedlist[z].stats.minval.toFixed(dp)+"</td>";
+            if(!isNaN(Number(feedlist[z].stats.maxval))) out += "<td>"+feedlist[z].stats.maxval.toFixed(dp)+"</td>";
             out += "<td>"+feedlist[z].stats.diff.toFixed(dp)+"</td>";
             out += "<td>"+feedlist[z].stats.mean.toFixed(dp)+"</td>";
             out += "<td>"+feedlist[z].stats.stdev.toFixed(dp)+"</td>";