Merge pull request #21 from NordicSemiconductor/master

Merge master to release/1.1

.gitignore

@@ -1,5 +1,10 @@
-node_modules
+.DS_Store
+.eslintrc
 .idea
+*.db
 dist
 jest.json
+log.txt
+node_modules
+npm-debug.log
 package-lock.json

lib/actions/modemActions.js

@@ -34,6 +34,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* eslint-disable import/no-cycle */
+
 import { logger } from 'nrfconnect/core';
 import getLocation from '../utils/locationApi';
 import ModemPort from '../../modemtalk';

lib/actions/uiActions.js

@@ -34,6 +34,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* eslint-disable import/no-cycle */
+
 import {
     TERMINAL_AUTO_SCROLL,
     API_TOKEN_UPDATE, AUTO_REQUESTS,

lib/components/CertificateManagerView.jsx

@@ -176,7 +176,7 @@ const CertificateManagerView = ({ hidden, writeTLSCredential, deleteTLSCredentia
         return performCertificateUpdate();
     }
 
-    const className = 'cert-mgr-view d-flex flex-column p-5 h-100 pretty-scrollbar';
+    const className = 'cert-mgr-view d-flex flex-column p-4 h-100 overflow-auto pretty-scrollbar';
     const textAreaProps = {
         as: 'textarea',
         className: 'text-monospace',
@@ -204,7 +204,7 @@ const CertificateManagerView = ({ hidden, writeTLSCredential, deleteTLSCredentia
                     for Cloud certificate, otherwise pick a different tag.
                 </div>
             </Alert>
-            <Form className="mt-4 mb-4">
+            <Form className="mt-4 mb-4 pr-4">
                 <Row>
                     <Col xs={8}>
                         {FormGroupWithCheckbox({

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pc-nrfconnect-linkmonitor",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "LTE Link Monitor",
   "displayName": "LTE Link Monitor",
   "repository": {
@@ -10,7 +10,7 @@
   "author": "Nordic Semiconductor ASA",
   "license": "SEE LICENSE IN LICENSE",
   "engines": {
-    "nrfconnect": "^3.0.0"
+    "nrfconnect": "^3.2.0"
   },
   "main": "dist/bundle.js",
   "files": [
@@ -24,6 +24,7 @@
     "webpack": "nrfconnect-scripts build-dev",
     "build": "nrfconnect-scripts build-prod",
     "nordic-publish": "nrfconnect-scripts nordic-publish",
+    "lint-init": "nrfconnect-scripts lint-init",
     "lint": "nrfconnect-scripts lint lib modemtalk index.jsx mocks test",
     "test": "jest --testResultsProcessor jest-bamboo-formatter",
     "test-watch": "jest --watch",
@@ -38,14 +39,13 @@
     "leaflet": "^1.2.0",
     "mcc-mnc-list": "^1.0.82",
     "nedb": "^1.8.0",
-    "pc-nrfconnect-devdep": "git+https://github.com/NordicSemiconductor/pc-nrfconnect-devdep.git#semver:^3.0.0",
+    "pc-nrfconnect-devdep": "git+https://github.com/NordicSemiconductor/pc-nrfconnect-devdep.git#semver:^3.1.0",
     "react-chartjs-2": "^2.5.6",
     "react-leaflet": "^1.5.0",
     "react-rangeslider": "^2.2.0"
   },
   "dependencies": {
-    "electron-store": "^2.0.0",
-    "serialport": "^6.2.0"
+    "electron-store": "^2.0.0"
   },
   "bundledDependencies": [
     "electron-store"