Added app icon and other bug fixes

ElectronClient/.gitignore

@@ -2,4 +2,5 @@ build/
 app/locales/
 app/node_modules/
 app/lib/
-*.min.js
+*.min.js
+dist/

ElectronClient/app/package-lock.json

@@ -241,8 +241,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-      "dev": true
     },
     "aws-sign2": {
       "version": "0.7.0",
@@ -1036,7 +1035,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
       "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-      "dev": true,
       "requires": {
         "delayed-stream": "1.0.0"
       }
@@ -1226,8 +1224,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-      "dev": true
     },
     "delegates": {
       "version": "1.0.0",
@@ -1915,7 +1912,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
       "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-      "dev": true,
       "requires": {
         "asynckit": "0.4.0",
         "combined-stream": "1.0.5",
@@ -2910,7 +2906,6 @@
       "version": "2.1.17",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-      "dev": true,
       "requires": {
         "mime-db": "1.30.0"
       }
@@ -5292,8 +5287,7 @@
     "uuid": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
-      "dev": true
     },
     "v8flags": {
       "version": "2.1.1",

ElectronClient/app/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "joplin-desktop",
+  "name": "Joplin",
   "version": "0.10.0",
   "description": "Joplin for Desktop",
   "main": "main.js",
@@ -18,9 +18,12 @@
   "bugs": {
     "url": "https://github.com/laurent22/joplin/issues"
   },
- "build": {
+  "build": {
-   "appId": "net.cozic.joplin-desktop"
+    "appId": "net.cozic.joplin-desktop",
- },
+    "win": {
+      "icon": "../../Assets/Joplin.ico"
+    }
+  },
   "homepage": "https://github.com/laurent22/joplin#readme",
   "devDependencies": {
     "babel-cli": "^6.26.0",
@@ -33,6 +36,7 @@
     "app-module-path": "^2.2.0",
     "electron-context-menu": "^0.9.1",
     "follow-redirects": "^1.2.5",
+    "form-data": "^2.3.1",
     "fs-extra": "^4.0.2",
     "highlight.js": "^9.12.0",
     "html-entities": "^1.2.1",
@@ -57,6 +61,7 @@
     "sqlite3": "^3.1.13",
     "string-padding": "^1.0.2",
     "string-to-stream": "^1.1.0",
-    "tcp-port-used": "^0.1.2"
+    "tcp-port-used": "^0.1.2",
+    "uuid": "^3.1.0"
   }
 }

ReactNativeClient/android/app/build.gradle

@@ -90,8 +90,8 @@ android {
 		applicationId "net.cozic.joplin"
 		minSdkVersion 16
 		targetSdkVersion 22
-		versionCode 54
+		versionCode 55
-		versionName "0.9.41"
+		versionName "0.9.42"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}

ReactNativeClient/lib/MdToHtml.js

@@ -275,7 +275,7 @@ class MdToHtml {
 		const tokens = md.parse(body, env);
 
 		// console.info(body);
-		console.info(tokens);
+		// console.info(tokens);
 
 		let renderedBody = this.renderTokens_(tokens, options);
 
@@ -353,6 +353,8 @@ class MdToHtml {
 
 		const output = styleHtml + renderedBody;
 
+		console.info(renderedBody);
+
 		this.cachedContent_ = output;
 		this.cachedContentKey_ = cacheKey;
 		return this.cachedContent_;