Merge remote-tracking branch 'upstream/dev' into pr/mobile/settings-c…

…ontrol-labels

.eslintignore

@@ -150,10 +150,13 @@ packages/app-desktop/checkForUpdates.js
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/editProfileConfig.js
 packages/app-desktop/commands/emptyTrash.js
+packages/app-desktop/commands/exportDeletionLog.test.js
+packages/app-desktop/commands/exportDeletionLog.js
 packages/app-desktop/commands/exportFolders.js
 packages/app-desktop/commands/exportNotes.js
 packages/app-desktop/commands/focusElement.js
 packages/app-desktop/commands/index.js
+packages/app-desktop/commands/openNoteInNewWindow.js
 packages/app-desktop/commands/openProfileDirectory.js
 packages/app-desktop/commands/renderMarkup.test.js
 packages/app-desktop/commands/renderMarkup.js
@@ -207,60 +210,14 @@ packages/app-desktop/gui/KeymapConfig/styles/index.js
 packages/app-desktop/gui/KeymapConfig/utils/getLabel.js
 packages/app-desktop/gui/KeymapConfig/utils/useCommandStatus.js
 packages/app-desktop/gui/KeymapConfig/utils/useKeymap.js
-packages/app-desktop/gui/MainScreen/MainScreen.js
-packages/app-desktop/gui/MainScreen/commands/addProfile.js
-packages/app-desktop/gui/MainScreen/commands/commandPalette.js
-packages/app-desktop/gui/MainScreen/commands/deleteFolder.js
-packages/app-desktop/gui/MainScreen/commands/duplicateNote.js
-packages/app-desktop/gui/MainScreen/commands/editAlarm.js
-packages/app-desktop/gui/MainScreen/commands/exportPdf.js
-packages/app-desktop/gui/MainScreen/commands/gotoAnything.js
-packages/app-desktop/gui/MainScreen/commands/hideModalMessage.js
-packages/app-desktop/gui/MainScreen/commands/index.js
-packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.js
-packages/app-desktop/gui/MainScreen/commands/moveToFolder.js
-packages/app-desktop/gui/MainScreen/commands/newFolder.js
-packages/app-desktop/gui/MainScreen/commands/newNote.js
-packages/app-desktop/gui/MainScreen/commands/newSubFolder.js
-packages/app-desktop/gui/MainScreen/commands/newTodo.js
-packages/app-desktop/gui/MainScreen/commands/openFolder.js
-packages/app-desktop/gui/MainScreen/commands/openFolderDialog.js
-packages/app-desktop/gui/MainScreen/commands/openItem.js
-packages/app-desktop/gui/MainScreen/commands/openNote.js
-packages/app-desktop/gui/MainScreen/commands/openPdfViewer.js
-packages/app-desktop/gui/MainScreen/commands/openTag.js
-packages/app-desktop/gui/MainScreen/commands/print.js
-packages/app-desktop/gui/MainScreen/commands/renameFolder.js
-packages/app-desktop/gui/MainScreen/commands/renameTag.js
-packages/app-desktop/gui/MainScreen/commands/resetLayout.js
-packages/app-desktop/gui/MainScreen/commands/restoreFolder.js
-packages/app-desktop/gui/MainScreen/commands/restoreNote.js
-packages/app-desktop/gui/MainScreen/commands/revealResourceFile.js
-packages/app-desktop/gui/MainScreen/commands/search.js
-packages/app-desktop/gui/MainScreen/commands/setTags.js
-packages/app-desktop/gui/MainScreen/commands/showModalMessage.js
-packages/app-desktop/gui/MainScreen/commands/showNoteContentProperties.js
-packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js
-packages/app-desktop/gui/MainScreen/commands/showPrompt.js
-packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js
-packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.js
-packages/app-desktop/gui/MainScreen/commands/showSpellCheckerMenu.test.js
-packages/app-desktop/gui/MainScreen/commands/showSpellCheckerMenu.js
-packages/app-desktop/gui/MainScreen/commands/toggleEditors.js
-packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js
-packages/app-desktop/gui/MainScreen/commands/toggleMenuBar.js
-packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
-packages/app-desktop/gui/MainScreen/commands/toggleNoteType.js
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js
-packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js
-packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js
-packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
-packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js
+packages/app-desktop/gui/MainScreen.js
 packages/app-desktop/gui/MasterPasswordDialog/Dialog.js
 packages/app-desktop/gui/MenuBar.js
 packages/app-desktop/gui/MultiNoteActions.js
 packages/app-desktop/gui/Navigator.js
+packages/app-desktop/gui/NewWindowOrIFrame.js
 packages/app-desktop/gui/NoteContentPropertiesDialog.js
+packages/app-desktop/gui/NoteEditor/EditorWindow.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/normalizeAccelerator.test.js
@@ -321,6 +278,7 @@ packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js
 packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js
+packages/app-desktop/gui/NoteEditor/utils/getWindowCommandPriority.js
 packages/app-desktop/gui/NoteEditor/utils/index.js
 packages/app-desktop/gui/NoteEditor/utils/markupRenderOptions.js
 packages/app-desktop/gui/NoteEditor/utils/resourceHandling.test.js
@@ -453,7 +411,66 @@ packages/app-desktop/gui/ToolbarButton/ToolbarButton.js
 packages/app-desktop/gui/ToolbarSpace.js
 packages/app-desktop/gui/TrashNotification/TrashNotification.js
 packages/app-desktop/gui/UpdateNotification/UpdateNotification.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/AppDialogs.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/ModalMessageOverlay.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/PluginDialogs.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/WindowCommandsAndDialogs.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/addProfile.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/commandPalette.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/deleteFolder.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/duplicateNote.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/editAlarm.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/exportPdf.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/gotoAnything.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/hideModalMessage.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/index.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/leaveSharedFolder.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/moveToFolder.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/newFolder.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/newNote.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/newSubFolder.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/newTodo.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/openFolder.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/openFolderDialog.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/openItem.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/openNote.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/openPdfViewer.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/openTag.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/print.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/renameFolder.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/renameTag.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/resetLayout.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/restoreFolder.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/restoreNote.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/revealResourceFile.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/search.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/setTags.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/showModalMessage.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/showNoteContentProperties.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/showNoteProperties.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/showPrompt.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/showShareFolderDialog.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/showShareNoteDialog.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/showSpellCheckerMenu.test.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/showSpellCheckerMenu.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleEditors.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleLayoutMoveMode.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleMenuBar.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleNoteList.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleNoteType.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleNotesSortOrderField.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleNotesSortOrderReverse.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/togglePerFolderSortOrder.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleSideBar.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleVisiblePanes.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/types.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/utils/appDialogs.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/utils/usePrintToCallback.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/utils/useSyncDialogState.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/utils/useWindowCommands.js
+packages/app-desktop/gui/WindowCommandsAndDialogs/utils/useWindowControl.js
 packages/app-desktop/gui/dialogs.js
+packages/app-desktop/gui/hooks/useDocument.js
 packages/app-desktop/gui/hooks/useEffectDebugger.js
 packages/app-desktop/gui/hooks/useElementHeight.js
 packages/app-desktop/gui/hooks/useImperativeHandlerDebugger.js
@@ -542,6 +559,7 @@ packages/app-desktop/utils/isSafeToOpen.test.js
 packages/app-desktop/utils/isSafeToOpen.js
 packages/app-desktop/utils/restartInSafeModeFromMain.test.js
 packages/app-desktop/utils/restartInSafeModeFromMain.js
+packages/app-desktop/utils/window/types.js
 packages/app-mobile/PluginAssetsLoader.js
 packages/app-mobile/commands/index.js
 packages/app-mobile/commands/newNote.test.js
@@ -992,6 +1010,8 @@ packages/lib/geolocation-node.js
 packages/lib/hooks/useAsyncEffect.js
 packages/lib/hooks/useElementSize.js
 packages/lib/hooks/useEventListener.js
+packages/lib/hooks/useNowEffect.test.js
+packages/lib/hooks/useNowEffect.js
 packages/lib/hooks/usePlugin.js
 packages/lib/hooks/usePrevious.js
 packages/lib/hooks/useQueuedAsyncEffect.test.js
@@ -1336,6 +1356,7 @@ packages/lib/services/trash/permanentlyDeleteOldItems.test.js
 packages/lib/services/trash/permanentlyDeleteOldItems.js
 packages/lib/services/trash/restoreItems.test.js
 packages/lib/services/trash/restoreItems.js
+packages/lib/shim-init-node.test.js
 packages/lib/shim-init-node.js
 packages/lib/shim.js
 packages/lib/string-utils.test.js

.github/workflows/automerge.yml

@@ -6,10 +6,10 @@ jobs:
 
   # This job will make the action fail if any of the checks hasn't passed
   # https://github.com/marketplace/actions/allcheckspassed
-  allchecks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: wechuli/allcheckspassed@v1
+  # allchecks:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: wechuli/allcheckspassed@v1
 
   automerge:
     runs-on: ubuntu-latest

.github/workflows/build-android.yml

@@ -5,20 +5,8 @@ name: react-native-android-build-apk
 on: [push, pull_request]
 
 jobs:
-  pre_job:
-    if: github.repository == 'laurent22/joplin'
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
   AssembleRelease:
-    needs: pre_job
-    if: github.repository == 'laurent22/joplin' && needs.pre_job.outputs.should_skip != 'true'
+    if: github.repository == 'laurent22/joplin'
     runs-on: ubuntu-latest
     steps:
       - name: Install Linux dependencies

.github/workflows/build-macos-m1.yml

@@ -1,21 +1,9 @@
 name: Build macOS M1
 on: [push, pull_request]
 jobs:
-  pre_job:
-    if: github.repository == 'laurent22/joplin'
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
   Main:
-    needs: pre_job
     # We always process desktop release tags, because they also publish the release
-    if: github.repository == 'laurent22/joplin' && (needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/v'))
+    if: github.repository == 'laurent22/joplin'
     runs-on: macos-latest
     steps:
 

.github/workflows/github-actions-main.yml

@@ -1,29 +1,15 @@
 name: Joplin Continuous Integration
 on: [push, pull_request]
 jobs:
-  pre_job:
-    if: github.repository == 'laurent22/joplin'
-    # Do not use unbuntu-latest because it causes `The operation was canceled` failures:
-    # https://github.com/actions/runner-images/issues/6709
-    runs-on: ubuntu-20.04
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
   Main:
-    needs: pre_job
     # We always process server or desktop release tags, because they also publish the release
-    if: github.repository == 'laurent22/joplin' && (needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/v'))
+    if: github.repository == 'laurent22/joplin'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         # Do not use unbuntu-latest because it causes `The operation was canceled` failures:
         # https://github.com/actions/runner-images/issues/6709
-        os: [macos-12, ubuntu-20.04, windows-2019]
+        os: [macos-13, ubuntu-20.04, windows-2019]
     steps:
 
       # Trying to fix random networking issues on Windows
@@ -157,8 +143,7 @@ jobs:
           yarn install && cd packages/app-desktop && yarn dist --publish=never
 
   ServerDockerImage:
-    needs: pre_job
-    if: github.repository == 'laurent22/joplin' && needs.pre_job.outputs.should_skip != 'true'
+    if: github.repository == 'laurent22/joplin'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix: