Merge branch 'master' into devel

src/components/ModWatchtools.jsx

@@ -299,6 +299,9 @@ function ModWatchtools() {
                 .map((row) => (
                   <tr key={row[0]}>
                     {row.slice(1).map((val, ind) => {
+                      if (val === null) {
+                        return (<td>N/A</td>);
+                      }
                       const type = types[ind + 1];
                       switch (type) {
                         case 'ts': {

src/utils/ProxyCheck.js

@@ -362,7 +362,7 @@ class ProxyCheck {
 
         if (res[value]) {
           this.logger.info(`Email ${value}: ${JSON.stringify(res[value])}`);
-          disposable = !!res[value].disposable;
+          disposable = res[value].disposable === 'yes';
         }
 
         cb(disposable);

webpack.config.client.js

@@ -9,7 +9,9 @@ const webpack = require('webpack');
 const AssetsPlugin = require('assets-webpack-plugin');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 
-// make sure we build in root dir
+/*
+ * make sure we build in root dir
+ */
 process.chdir(__dirname);
 
 /*