Merge branch 'dev' of github.com:laurent22/joplin into dev

ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx

@@ -308,11 +308,6 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
 
 		async function loadScripts() {
 			const scriptsToLoad:{src: string, id:string, loaded: boolean}[] = [
-				{
-					src: 'node_modules/codemirror/lib/codemirror.css',
-					id: 'codemirrorBaseStyle',
-					loaded: false,
-				},
 				{
 					src: 'node_modules/codemirror/addon/dialog/dialog.css',
 					id: 'codemirrorDialogStyle',

ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx

@@ -139,8 +139,8 @@ function Editor(props: EditorProps, ref: any) {
 			'Right': 'goCharRight',
 			'Up': 'goLineUp',
 			'Down': 'goLineDown',
-			'End': 'goLineEnd',
-			'Home': 'goLineStartSmart',
+			'End': 'goLineRight',
+			'Home': 'goLineLeftSmart',
 			'PageUp': 'goPageUp',
 			'PageDown': 'goPageDown',
 			'Delete': 'delCharAfter',

ElectronClient/index.html

@@ -12,6 +12,7 @@
 		<link rel="stylesheet" href="node_modules/@fortawesome/fontawesome-free/css/all.min.css">
 		<link rel="stylesheet" href="node_modules/react-datetime/css/react-datetime.css">
 		<link rel="stylesheet" href="node_modules/smalltalk/css/smalltalk.css">
+		<link rel="stylesheet" href="node_modules/codemirror/lib/codemirror.css">
 
 		<style>
 			.smalltalk {

README.md

@@ -88,7 +88,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 
 - Development
 
-	- [End-to-end encryption spec](https://github.com/laurent22/joplin/blob/master/readme/spec/e2ee.md)
+	- [End-to-end encryption spec](https://github.com/laurent22/joplin/blob/master/readme/spec.md)
 	- [Note History spec](https://github.com/laurent22/joplin/blob/master/readme/spec/history.md)
 	- [Sync Lock spec](https://github.com/laurent22/joplin/blob/master/readme/spec/sync_lock.md)