You've already forked joplin
							
							
				mirror of
				https://github.com/laurent22/joplin.git
				synced 2025-10-31 00:07:48 +02:00 
			
		
		
		
	Merge branch 'master' of github.com:laurent22/joplin
This commit is contained in:
		
							
								
								
									
										186
									
								
								CliClient/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										186
									
								
								CliClient/package-lock.json
									
									
									
										generated
									
									
									
								
							| @@ -1886,13 +1886,28 @@ | ||||
|       } | ||||
|     }, | ||||
|     "needle": { | ||||
|       "version": "2.2.1", | ||||
|       "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz", | ||||
|       "integrity": "sha512-t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==", | ||||
|       "version": "2.3.1", | ||||
|       "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.1.tgz", | ||||
|       "integrity": "sha512-CaLXV3W8Vnbps8ZANqDGz7j4x7Yj1LW4TWF/TQuDfj7Cfx4nAPTvw98qgTevtto1oHDrh3pQkaODbqupXlsWTg==", | ||||
|       "requires": { | ||||
|         "debug": "^2.1.2", | ||||
|         "debug": "^4.1.0", | ||||
|         "iconv-lite": "^0.4.4", | ||||
|         "sax": "^1.2.4" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "debug": { | ||||
|           "version": "4.1.1", | ||||
|           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", | ||||
|           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", | ||||
|           "requires": { | ||||
|             "ms": "^2.1.1" | ||||
|           } | ||||
|         }, | ||||
|         "ms": { | ||||
|           "version": "2.1.1", | ||||
|           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", | ||||
|           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "nextgen-events": { | ||||
| @@ -1949,13 +1964,13 @@ | ||||
|       } | ||||
|     }, | ||||
|     "node-pre-gyp": { | ||||
|       "version": "0.10.2", | ||||
|       "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz", | ||||
|       "integrity": "sha512-16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug==", | ||||
|       "version": "0.11.0", | ||||
|       "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz", | ||||
|       "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==", | ||||
|       "requires": { | ||||
|         "detect-libc": "^1.0.2", | ||||
|         "mkdirp": "^0.5.1", | ||||
|         "needle": "^2.2.0", | ||||
|         "needle": "^2.2.1", | ||||
|         "nopt": "^4.0.1", | ||||
|         "npm-packlist": "^1.1.6", | ||||
|         "npmlog": "^4.0.2", | ||||
| @@ -1963,13 +1978,6 @@ | ||||
|         "rimraf": "^2.6.1", | ||||
|         "semver": "^5.3.0", | ||||
|         "tar": "^4" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "detect-libc": { | ||||
|           "version": "1.0.3", | ||||
|           "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", | ||||
|           "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "noop-logger": { | ||||
| @@ -1987,14 +1995,14 @@ | ||||
|       } | ||||
|     }, | ||||
|     "npm-bundled": { | ||||
|       "version": "1.0.3", | ||||
|       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", | ||||
|       "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==" | ||||
|       "version": "1.0.6", | ||||
|       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", | ||||
|       "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==" | ||||
|     }, | ||||
|     "npm-packlist": { | ||||
|       "version": "1.1.10", | ||||
|       "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", | ||||
|       "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", | ||||
|       "version": "1.4.1", | ||||
|       "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz", | ||||
|       "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", | ||||
|       "requires": { | ||||
|         "ignore-walk": "^3.0.1", | ||||
|         "npm-bundled": "^1.0.1" | ||||
| @@ -2588,18 +2596,136 @@ | ||||
|       "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=" | ||||
|     }, | ||||
|     "sqlite3": { | ||||
|       "version": "4.0.1", | ||||
|       "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.1.tgz", | ||||
|       "integrity": "sha512-i8LtU2fdEGFEt4Kcs7eNjYdGmnAQ8zWlaOv6Esbq/jfVfR0Qbn/1dgVyKebrMc2zN7h3oHsqla9zq7AJ0+34ZA==", | ||||
|       "version": "4.0.7", | ||||
|       "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.7.tgz", | ||||
|       "integrity": "sha512-TGEeSBB8O48bEu8KUUMqzeB22WrfTxzhIf0lFm8wLTo3a6yJBonF2sPKMYrYtOne1F1t9AHAEn+DTISq8WebQg==", | ||||
|       "requires": { | ||||
|         "nan": "~2.10.0", | ||||
|         "node-pre-gyp": "~0.10.1" | ||||
|         "nan": "^2.12.1", | ||||
|         "node-pre-gyp": "^0.11.0", | ||||
|         "request": "^2.87.0" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "nan": { | ||||
|           "version": "2.10.0", | ||||
|           "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", | ||||
|           "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" | ||||
|         "ajv": { | ||||
|           "version": "6.10.0", | ||||
|           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", | ||||
|           "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", | ||||
|           "requires": { | ||||
|             "fast-deep-equal": "^2.0.1", | ||||
|             "fast-json-stable-stringify": "^2.0.0", | ||||
|             "json-schema-traverse": "^0.4.1", | ||||
|             "uri-js": "^4.2.2" | ||||
|           } | ||||
|         }, | ||||
|         "aws4": { | ||||
|           "version": "1.8.0", | ||||
|           "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", | ||||
|           "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" | ||||
|         }, | ||||
|         "combined-stream": { | ||||
|           "version": "1.0.7", | ||||
|           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", | ||||
|           "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", | ||||
|           "requires": { | ||||
|             "delayed-stream": "~1.0.0" | ||||
|           } | ||||
|         }, | ||||
|         "extend": { | ||||
|           "version": "3.0.2", | ||||
|           "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", | ||||
|           "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" | ||||
|         }, | ||||
|         "fast-deep-equal": { | ||||
|           "version": "2.0.1", | ||||
|           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", | ||||
|           "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" | ||||
|         }, | ||||
|         "form-data": { | ||||
|           "version": "2.3.3", | ||||
|           "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", | ||||
|           "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", | ||||
|           "requires": { | ||||
|             "asynckit": "^0.4.0", | ||||
|             "combined-stream": "^1.0.6", | ||||
|             "mime-types": "^2.1.12" | ||||
|           } | ||||
|         }, | ||||
|         "har-validator": { | ||||
|           "version": "5.1.3", | ||||
|           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", | ||||
|           "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", | ||||
|           "requires": { | ||||
|             "ajv": "^6.5.5", | ||||
|             "har-schema": "^2.0.0" | ||||
|           } | ||||
|         }, | ||||
|         "json-schema-traverse": { | ||||
|           "version": "0.4.1", | ||||
|           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", | ||||
|           "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" | ||||
|         }, | ||||
|         "mime-db": { | ||||
|           "version": "1.40.0", | ||||
|           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", | ||||
|           "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" | ||||
|         }, | ||||
|         "mime-types": { | ||||
|           "version": "2.1.24", | ||||
|           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", | ||||
|           "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", | ||||
|           "requires": { | ||||
|             "mime-db": "1.40.0" | ||||
|           } | ||||
|         }, | ||||
|         "oauth-sign": { | ||||
|           "version": "0.9.0", | ||||
|           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", | ||||
|           "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" | ||||
|         }, | ||||
|         "request": { | ||||
|           "version": "2.88.0", | ||||
|           "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", | ||||
|           "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", | ||||
|           "requires": { | ||||
|             "aws-sign2": "~0.7.0", | ||||
|             "aws4": "^1.8.0", | ||||
|             "caseless": "~0.12.0", | ||||
|             "combined-stream": "~1.0.6", | ||||
|             "extend": "~3.0.2", | ||||
|             "forever-agent": "~0.6.1", | ||||
|             "form-data": "~2.3.2", | ||||
|             "har-validator": "~5.1.0", | ||||
|             "http-signature": "~1.2.0", | ||||
|             "is-typedarray": "~1.0.0", | ||||
|             "isstream": "~0.1.2", | ||||
|             "json-stringify-safe": "~5.0.1", | ||||
|             "mime-types": "~2.1.19", | ||||
|             "oauth-sign": "~0.9.0", | ||||
|             "performance-now": "^2.1.0", | ||||
|             "qs": "~6.5.2", | ||||
|             "safe-buffer": "^5.1.2", | ||||
|             "tough-cookie": "~2.4.3", | ||||
|             "tunnel-agent": "^0.6.0", | ||||
|             "uuid": "^3.3.2" | ||||
|           } | ||||
|         }, | ||||
|         "safe-buffer": { | ||||
|           "version": "5.1.2", | ||||
|           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", | ||||
|           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" | ||||
|         }, | ||||
|         "tough-cookie": { | ||||
|           "version": "2.4.3", | ||||
|           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", | ||||
|           "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", | ||||
|           "requires": { | ||||
|             "psl": "^1.1.24", | ||||
|             "punycode": "^1.4.1" | ||||
|           } | ||||
|         }, | ||||
|         "uuid": { | ||||
|           "version": "3.3.2", | ||||
|           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", | ||||
|           "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|   | ||||
| @@ -63,7 +63,7 @@ | ||||
|     "server-destroy": "^1.0.1", | ||||
|     "sharp": "^0.22.1", | ||||
|     "sprintf-js": "^1.1.1", | ||||
|     "sqlite3": "^4.0.1", | ||||
|     "sqlite3": "^4.0.7", | ||||
|     "string-padding": "^1.0.2", | ||||
|     "string-to-stream": "^1.1.0", | ||||
|     "strip-ansi": "^4.0.0", | ||||
|   | ||||
| @@ -20,9 +20,9 @@ Three types of applications are available: for the **desktop** (Windows, macOS a | ||||
|  | ||||
| Operating System | Download | Alternative | ||||
| -----------------|--------|------------------- | ||||
| Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.143/Joplin-Setup-1.0.143.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.143/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file. | ||||
| macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.143/Joplin-1.0.143.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin` | ||||
| Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.143/Joplin-1.0.143-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash` | ||||
| Windows (32 and 64-bit)         | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.145/Joplin-Setup-1.0.145.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.145/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file. | ||||
| macOS          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.145/Joplin-1.0.145.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin` | ||||
| Linux          | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.145/Joplin-1.0.145-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash` | ||||
|  | ||||
| ## Mobile applications | ||||
|  | ||||
|   | ||||
| @@ -37,7 +37,9 @@ | ||||
| 		android:allowBackup="true" | ||||
| 		android:label="@string/app_name" | ||||
| 		android:icon="@mipmap/ic_launcher" | ||||
| 		android:theme="@style/AppTheme"> | ||||
| 		android:theme="@style/AppTheme" | ||||
| 		android:networkSecurityConfig="@xml/network_security_config" | ||||
| 		> | ||||
|  | ||||
| 		<!-- ============================= --> | ||||
| 		<!-- START RN-push-notitication    --> | ||||
|   | ||||
| @@ -0,0 +1,9 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <network-security-config> | ||||
|     <base-config> | ||||
|         <trust-anchors> | ||||
|             <certificates src="system"/> | ||||
|             <certificates src="user"/> | ||||
|         </trust-anchors> | ||||
|     </base-config> | ||||
| </network-security-config> | ||||
							
								
								
									
										1
									
								
								Tools/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								Tools/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| *-kct.* | ||||
| @@ -288,17 +288,17 @@ | ||||
| <tbody> | ||||
| <tr> | ||||
| <td>Windows (32 and 64-bit)</td> | ||||
| <td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.143/Joplin-Setup-1.0.143.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td> | ||||
| <td>Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.143/JoplinPortable.exe'>Portable version</a><br><br>The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.</td> | ||||
| <td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.145/Joplin-Setup-1.0.145.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td> | ||||
| <td>Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.145/JoplinPortable.exe'>Portable version</a><br><br>The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.</td> | ||||
| </tr> | ||||
| <tr> | ||||
| <td>macOS</td> | ||||
| <td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.143/Joplin-1.0.143.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td> | ||||
| <td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.145/Joplin-1.0.145.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td> | ||||
| <td>You can also use Homebrew: <code>brew cask install joplin</code></td> | ||||
| </tr> | ||||
| <tr> | ||||
| <td>Linux</td> | ||||
| <td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.143/Joplin-1.0.143-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td> | ||||
| <td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.145/Joplin-1.0.145-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td> | ||||
| <td>An Arch Linux package <a href="#terminal-application">is also available</a>.<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> <code>wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash</code></td> | ||||
| </tr> | ||||
| </tbody> | ||||
|   | ||||
| @@ -93,3 +93,7 @@ Joplin relies on Firebase to enable reliable notifications on Android. Since F-D | ||||
| # Why is it named Joplin? | ||||
|  | ||||
| The name comes from the composer and pianist [Scott Joplin](https://en.wikipedia.org/wiki/Scott_Joplin), which I often listen to. His name is also easy to remember and type so it fell like a good choice. And, to quote a user on Hacker News, "though Scott Joplin's ragtime musical style has a lot in common with some very informal music, his own approach was more educated, sophisticated, and precise. Every note was in its place for a reason, and he was known to prefer his pieces to be performed exactly as written. So you could say that compared to the people who came before him, his notes were more organized". | ||||
|  | ||||
| # How can I use self-signed SSL certificates on Android? | ||||
|  | ||||
| If you want to serve using https but can't or don't want to use SSL certificates signed by trusted certificate authorities (like "Let's Encrypt"), it's possible to generate a custom CA and sign your certificates with it. You can generate the CA and certificates using [openssl](https://gist.github.com/fntlnz/cf14feb5a46b2eda428e000157447309), but I like to use a tool called [mkcert](https://github.com/FiloSottile/mkcert) for it's simplicity. Finally, you have to add your CA certificate to Android settings so that Android can recognize the certificates you signed with your CA as valid ([link](https://support.google.com/nexus/answer/2844832?hl=en-GB)). | ||||
|   | ||||
		Reference in New Issue
	
	Block a user