Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map

src/public/app/layouts/desktop_main_window_layout.js

@@ -25,6 +25,7 @@ import NoteRevisionsWidget from "../widgets/collapsible_widgets/note_revisions.j
 import SimilarNotesWidget from "../widgets/collapsible_widgets/similar_notes.js";
 import WhatLinksHereWidget from "../widgets/collapsible_widgets/what_links_here.js";
 import SidePaneToggles from "../widgets/side_pane_toggles.js";
+import EditedNotesWidget from "../widgets/collapsible_widgets/edited_notes.js";
 
 const RIGHT_PANE_CSS = `
 <style>
@@ -145,6 +146,7 @@ export default class DesktopMainWindowLayout {
                     .hideInZenMode()
                     .child(new NoteInfoWidget())
                     .child(new TabCachingWidget(() => new CalendarWidget()))
+                    .child(new TabCachingWidget(() => new EditedNotesWidget()))
                     .child(new TabCachingWidget(() => new AttributesWidget()))
                     .child(new TabCachingWidget(() => new LinkMapWidget()))
                     .child(new TabCachingWidget(() => new NoteRevisionsWidget()))

src/public/app/services/link.js

@@ -164,6 +164,7 @@ $(document).on('mousedown', '.note-detail-text a.reference-link', goToLink);
 $(document).on('mousedown', '.note-detail-readonly-text a.reference-link', goToLink);
 $(document).on('mousedown', '.note-detail-readonly-text a', goToLink);
 $(document).on('mousedown', 'a.ck-link-actions__preview', goToLink);
+$(document).on('click', 'section.include-note a', goToLink);
 $(document).on('click', 'a.ck-link-actions__preview', e => {
     e.preventDefault();
     e.stopPropagation();
@@ -175,6 +176,7 @@ $(document).on('contextmenu', '.note-detail-readonly-text a', linkContextMenu);
 $(document).on('contextmenu', "a[data-action='note']", linkContextMenu);
 $(document).on('contextmenu', ".note-detail-render a", linkContextMenu);
 $(document).on('contextmenu', ".note-paths-widget a", linkContextMenu);
+$(document).on('contextmenu', "section.include-note a", linkContextMenu);
 
 export default {
     getNotePathFromUrl,

src/services/keyboard_actions.js

@@ -327,7 +327,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
     {
         actionName: "printActiveNote",
         defaultShortcuts: [],
-        scope: "note-detail"
+        scope: "window"
     },
     {
         actionName: "runActiveNote",