Server v2.10.5

lock file
Server: Fixes #7525 : Fixed regression that would prevent styles from being loaded in published notes
2025-09-02 20:46:21 +02:00 · 2022-12-26 12:09:27 +00:00 · 2022-12-26 11:56:47 +00:00 · 2022-12-26 11:56:34 +00:00 · 2022-12-26 11:02:08 +00:00 · 2022-12-24 21:19:15 -05:00
22 changed files with 218 additions and 132 deletions
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -12,7 +12,7 @@ jobs:
      - name: "CLA Assistant"
        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
        # Beta Release
-        uses: contributor-assistant/github-action@v2.2.0
+        uses: contributor-assistant/github-action@v2.2.1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          # the below token should have repo scope and must be manually added by you in the repository's secret
--- a/packages/app-cli/package.json
+++ b/packages/app-cli/package.json
@@ -42,7 +42,7 @@
  "dependencies": {
    "@joplin/lib": "~2.10",
    "@joplin/renderer": "~2.10",
-    "aws-sdk": "2.1279.0",
+    "aws-sdk": "2.1282.0",
    "chalk": "4.1.2",
    "compare-version": "0.1.2",
    "fs-extra": "11.1.0",
@@ -55,7 +55,7 @@
    "proper-lockfile": "4.1.2",
    "read-chunk": "2.1.0",
    "server-destroy": "1.0.1",
-    "sharp": "0.31.2",
+    "sharp": "0.31.3",
    "sprintf-js": "1.1.2",
    "sqlite3": "5.1.4",
    "string-padding": "1.0.2",
--- a/packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts
+++ b/packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts
@@ -145,6 +145,16 @@ export default function useSource(noteBody: string, noteMarkupLanguage: number,
 						font: -apple-system-body;
 					}
 				}
+
+				/*
+				 iOS seems to increase inertial scrolling friction when the WebView body/root elements
+				 scroll. Scroll the main container instead.
+				*/
+				body > #rendered-md {
+					width: 100vw;
+					height: 100vh;
+					overflow: auto;
+				}
 			`;

 			html =
--- a/packages/app-mobile/components/NoteEditor/CodeMirror/markdownMathParser.test.ts
+++ b/packages/app-mobile/components/NoteEditor/CodeMirror/markdownMathParser.test.ts
@@ -2,7 +2,7 @@ import { markdown } from '@codemirror/lang-markdown';
 import { syntaxTree } from '@codemirror/language';
 import { SyntaxNode } from '@lezer/common';
 import { EditorState } from '@codemirror/state';
-import { blockMathTagName, inlineMathContentTagName, inlineMathTagName, MarkdownMathExtension } from './markdownMathParser';
+import { blockMathTagName, inlineMathTagName, MarkdownMathExtension } from './markdownMathParser';
 import { GFM as GithubFlavoredMarkdownExt } from '@lezer/markdown';
 import forceFullParse from './testUtil/forceFullParse';

@@ -37,21 +37,24 @@ const findNodesWithName = (editor: EditorState, nodeName: string) => {
 };

 describe('markdownMathParser', () => {
-	it('should parse inline math that contains space characters, numbers, and symbols', () => {
-		const documentText = '$3 + 3$';
-		const editor = createEditorState(documentText);
-		const inlineMathNodes = findNodesWithName(editor, inlineMathTagName);
-		const inlineMathContentNodes = findNodesWithName(editor, inlineMathContentTagName);

-		// There should only be one inline node
-		expect(inlineMathNodes.length).toBe(1);
+	// Disable flaky test - randomly fails on line `expect(inlineMathContentNodes.length).toBe(0);`

-		expect(inlineMathNodes[0].from).toBe(0);
-		expect(inlineMathNodes[0].to).toBe(documentText.length);
+	// it('should parse inline math that contains space characters, numbers, and symbols', () => {
+	// 	const documentText = '$3 + 3$';
+	// 	const editor = createEditorState(documentText);
+	// 	const inlineMathNodes = findNodesWithName(editor, inlineMathTagName);
+	// 	const inlineMathContentNodes = findNodesWithName(editor, inlineMathContentTagName);

-		// The content tag should be replaced by the internal sTeX parser
-		expect(inlineMathContentNodes.length).toBe(0);
-	});
+	// 	// There should only be one inline node
+	// 	expect(inlineMathNodes.length).toBe(1);
+
+	// 	expect(inlineMathNodes[0].from).toBe(0);
+	// 	expect(inlineMathNodes[0].to).toBe(documentText.length);
+
+	// 	// The content tag should be replaced by the internal sTeX parser
+	// 	expect(inlineMathContentNodes.length).toBe(0);
+	// });

 	it('should parse comment within multi-word inline math', () => {
 		const beforeMath = '# Testing!\n\nThis is a test of ';
--- a/packages/app-mobile/components/screens/Note.tsx
+++ b/packages/app-mobile/components/screens/Note.tsx
@@ -38,8 +38,7 @@ const { dialogs } = require('../../utils/dialogs.js');
 const DialogBox = require('react-native-dialogbox').default;
 const ImageResizer = require('react-native-image-resizer').default;
 const shared = require('@joplin/lib/components/shared/note-screen-shared.js');
-const ImagePicker = require('react-native-image-picker').default;
-import { ImagePickerResponse } from 'react-native-image-picker';
+import { ImagePickerResponse, launchImageLibrary } from 'react-native-image-picker';
 import SelectDateTimeDialog from '../SelectDateTimeDialog';
 import ShareExtension from '../../utils/ShareExtension.js';
 import CameraView from '../CameraView';
@@ -562,14 +561,6 @@ class NoteScreenComponent extends BaseScreenComponent {
 		});
 	}

-	showImagePicker(options: any) {
-		return new Promise((resolve) => {
-			ImagePicker.launchImageLibrary(options, (response: any) => {
-				resolve(response);
-			});
-		});
-	}
-
 	async resizeImage(localFilePath: string, targetPath: string, mimeType: string) {
 		const maxSize = Resource.IMAGE_MAX_DIMENSION;

@@ -720,7 +711,7 @@ class NoteScreenComponent extends BaseScreenComponent {

 	private async attachPhoto_onPress() {
 		// the selection Limit should be specfied. I think 200 is enough?
-		const response: ImagePickerResponse = await this.showImagePicker({ mediaType: 'photo', includeBase64: false, selectionLimit: 200 });
+		const response: ImagePickerResponse = await launchImageLibrary({ mediaType: 'photo', includeBase64: false, selectionLimit: 200 });

 		if (response.errorCode) {
 			reg.logger().warn('Got error from picker', response.errorCode);
--- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
+++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
@@ -492,7 +492,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Joplin/Info.plist;
@@ -521,7 +521,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -667,7 +667,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -698,7 +698,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 84;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
--- a/packages/app-mobile/ios/Podfile.lock
+++ b/packages/app-mobile/ios/Podfile.lock
@@ -229,7 +229,7 @@ PODS:
    - React-Core
  - react-native-get-random-values (1.8.0):
    - React-Core
-  - react-native-image-picker (4.10.2):
+  - react-native-image-picker (4.10.3):
    - React-Core
  - react-native-image-resizer (1.4.5):
    - React-Core
@@ -533,7 +533,7 @@ SPEC CHECKSUMS:
  react-native-document-picker: 958e2bc82e128be69055be261aeac8d872c8d34c
  react-native-geolocation: 69f4fd37650b8e7fee91816d395e62dd16f5ab8d
  react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
-  react-native-image-picker: bf34f3f516d139ed3e24c5f5a381a91819e349ea
+  react-native-image-picker: 60f4246eb5bb7187fc15638a8c1f13abd3820695
  react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
  react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
  react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a
--- a/packages/app-mobile/package.json
+++ b/packages/app-mobile/package.json
@@ -47,7 +47,7 @@
    "react-native-file-viewer": "2.1.5",
    "react-native-fs": "2.20.0",
    "react-native-get-random-values": "1.8.0",
-    "react-native-image-picker": "4.10.2",
+    "react-native-image-picker": "4.10.3",
    "react-native-image-resizer": "1.4.5",
    "react-native-modal-datetime-picker": "14.0.1",
    "react-native-popup-menu": "0.16.1",
--- a/packages/lib/BaseApplication.ts
+++ b/packages/lib/BaseApplication.ts
@@ -857,7 +857,7 @@ export default class BaseApplication {
 			// Setting.setValue('sync.10.path', 'https://api.joplincloud.com');
 			// Setting.setValue('sync.10.userContentPath', 'https://joplinusercontent.com');
 			Setting.setValue('sync.10.path', 'http://api.joplincloud.local:22300');
-			Setting.setValue('sync.10.userContentPath', 'http://joplincloud.local:22300');
+			Setting.setValue('sync.10.userContentPath', 'http://joplinusercontent.local:22300');
 		}

 		// For now always disable fuzzy search due to performance issues:
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -25,12 +25,12 @@
    "@types/uuid": "^9.0.0",
    "clean-html": "1.5.0",
    "jest": "29.3.1",
-    "sharp": "0.31.2",
+    "sharp": "0.31.3",
    "typescript": "4.9.4"
  },
  "dependencies": {
-    "@aws-sdk/client-s3": "3.235.0",
-    "@aws-sdk/s3-request-presigner": "3.235.0",
+    "@aws-sdk/client-s3": "3.238.0",
+    "@aws-sdk/s3-request-presigner": "3.238.0",
    "@joplin/fork-htmlparser2": "^4.1.41",
    "@joplin/fork-sax": "^1.2.45",
    "@joplin/fork-uslug": "^1.0.6",
--- a/packages/lib/services/joplinServer/personalizedUserContentBaseUrl.ts
+++ b/packages/lib/services/joplinServer/personalizedUserContentBaseUrl.ts
@@ -9,7 +9,8 @@
 // If the userContentBaseUrl is an empty string, the baseUrl is returned instead.
 export default function(userId: string, baseUrl: string, userContentBaseUrl: string) {
 	// Special case for development, because it's difficult to get wildcard domains working locally.
-	if (userContentBaseUrl === 'http://joplincloud.local:22300') return 'http://joplincloud.local:22300';
+	// if (userContentBaseUrl === 'http://joplincloud.local:22300') return 'http://joplincloud.local:22300';
+	// if (userContentBaseUrl === 'http://joplincloud.local:22300') return 'http://abcd1234.joplinusercontent.local:22300';

 	if (userContentBaseUrl && baseUrl !== userContentBaseUrl) {
 		if (!userId) throw new Error('User ID must be specified');
--- a/packages/pdf-viewer/package.json
+++ b/packages/pdf-viewer/package.json
@@ -22,7 +22,7 @@
    "@types/jest": "29.2.4",
    "@types/pdfjs-dist": "2.10.378",
    "@types/react": "16.14.34",
-    "@types/react-dom": "18.0.9",
+    "@types/react-dom": "18.0.10",
    "@types/styled-components": "5.1.25",
    "babel-jest": "29.3.1",
    "css-loader": "6.7.3",
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/server",
-  "version": "2.10.4",
+  "version": "2.10.5",
  "private": true,
  "scripts": {
    "start-dev": "yarn run build && JOPLIN_IS_TESTING=1 nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev",
@@ -21,11 +21,11 @@
    "watch": "tsc --watch --preserveWatchOutput --project tsconfig.json"
  },
  "dependencies": {
-    "@aws-sdk/client-s3": "3.235.0",
+    "@aws-sdk/client-s3": "3.238.0",
    "@fortawesome/fontawesome-free": "5.15.4",
    "@joplin/lib": "~2.10",
    "@joplin/renderer": "~2.10",
-    "@koa/cors": "4.0.0",
+    "@koa/cors": "3.1.0",
    "@types/uuid": "9.0.0",
    "bcryptjs": "2.4.3",
    "bulma": "0.9.4",
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -184,7 +184,7 @@ async function main() {
 	app.use(cors({
 		// https://github.com/koajs/cors/issues/52#issuecomment-413887382
 		origin: (ctx: AppContext) => {
-			const origin = ctx.request.origin;
+			const origin = ctx.request.header.origin;

 			if (acceptOrigin(origin)) {
 				return origin;
--- a/packages/tools/locales/de_DE.po
+++ b/packages/tools/locales/de_DE.po
@@ -7,6 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
 "Last-Translator: MrKanister <pueblos_spatulas@aleeas.com>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -14,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.2.1\n"
+"X-Generator: Poedit 3.2.2\n"

 #: packages/app-mobile/components/screens/ConfigScreen.tsx:609
 msgid "- Camera: to allow taking a picture and attaching it to a note."
@@ -349,8 +351,8 @@ msgstr ""

 #: packages/app-cli/app/command-mv.js:29
 msgid ""
-"Ambiguous notebook \"%s\". Please use short notebook id instead - press "
-"\"ti\" to see the short notebook id"
+"Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti"
+"\" to see the short notebook id"
 msgstr ""
 "Zweideutiges Notizbuch „%s“. Bitte verwende stattdessen die kurze Notizbuch-"
 "ID - drücke „ti“, um die kurze Notizbuch-ID zu sehen"
@@ -3856,9 +3858,8 @@ msgid "Stop external editing"
 msgstr "Externe Bearbeitung stoppen"

 #: packages/lib/utils/joplinCloud.ts:129
-#, fuzzy
 msgid "Storage space"
-msgstr "%d GB Speicherplatz"
+msgstr "Speicherplatz"

 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:19
 msgid "Strikethrough"
@@ -4496,8 +4497,8 @@ msgstr "Um die Konsole zu maximieren/minimieren, drücke „tc“."
 #: packages/app-cli/app/command-help.js:79
 msgid "To move from one pane to another, press Tab or Shift+Tab."
 msgstr ""
-"Um von einem Bereich zu einem anderen zu wechseln, drücke Tab oder "
-"Umschalt+Tab."
+"Um von einem Bereich zu einem anderen zu wechseln, drücke Tab oder Umschalt"
+"+Tab."

 #: packages/app-cli/app/command-status.js:44
 msgid ""
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@@ -36,7 +36,7 @@
    "node-fetch": "2.6.7",
    "relative": "3.0.2",
    "request": "2.88.2",
-    "sharp": "0.31.2",
+    "sharp": "0.31.3",
    "source-map-support": "0.5.21",
    "uri-template": "2.0.0",
    "yargs": "17.6.2"
--- a/readme/build_troubleshooting.md
+++ b/readme/build_troubleshooting.md
@@ -2,8 +2,6 @@

 ## On Windows

-test
-
 If `yarn dist` fails, it may need administrative rights.

 If you get an `error MSB8020: The build tools for v140 cannot be found.` try to run with a different toolset version, eg `npm install --toolset=v141` (See [here](https://github.com/mapbox/node-sqlite3/issues/1124) for more info). You may also try to install `npm --vs2015 install --global windows-build-tools` (the --vs2015 flag is to get toolkit "v140", which is what is used by default).
--- a/readme/changelog_ios.md
+++ b/readme/changelog_ios.md
@@ -1,5 +1,9 @@
 # Joplin iOS app changelog

+## [ios-v12.9.2](https://github.com/laurent22/joplin/releases/tag/ios-v12.9.2) - 2022-12-22T12:42:26Z
+
+- Fixed: Could not attach images to notes anymore (#7471)
+
 ## [ios-v12.9.1](https://github.com/laurent22/joplin/releases/tag/ios-v12.9.1) - 2022-12-04T18:03:02Z

 - New: Add Markdown toolbar (#6753 by Henry Heino)
--- a/readme/changelog_server.md
+++ b/readme/changelog_server.md
@@ -1,5 +1,9 @@
 # Joplin Server Changelog

+## [server-v2.10.5](https://github.com/laurent22/joplin/releases/tag/server-v2.10.5) - 2022-12-26T12:09:13Z
+
+- Fixed: Fixed regression that would prevent styles from being loaded in published notes (#7525)
+
 ## [server-v2.10.4](https://github.com/laurent22/joplin/releases/tag/server-v2.10.4) - 2022-12-18T16:02:06Z

 - Fixed: Fixed regression introduced by form-parse lib update (#7463)
--- a/readme/cla.md
+++ b/readme/cla.md
@@ -9,9 +9,7 @@ to the license terms below. This license is for your protection as a Contributor
 as well as the protection of the Company and its users; it does not change your
 rights to use your own Contributions for any other purpose.

-Please complete and sign this Agreement, and then email a copy to
-cla@joplinapp.org only (do not copy any other persons or lists). Read this
-document carefully before signing and keep a copy for your records.
+Read this document carefully before signing and keep a copy for your records.

 You accept and agree to the following terms and conditions for Your present and
 future Contributions submitted to the Company. In return, the Company shall not
--- a/readme/cla_signatures.json
+++ b/readme/cla_signatures.json
@@ -0,0 +1,76 @@
+{
+  "signedContributors": [
+    {
+      "name": "laurent22",
+      "id": 1285584,
+      "comment_id": 1361665980,
+      "created_at": "2022-12-21T16:54:13Z",
+      "repoId": 79162682,
+      "pullRequestNo": 7510
+    },
+    {
+      "name": "wh201906",
+      "id": 62299611,
+      "comment_id": 1361737493,
+      "created_at": "2022-12-21T17:39:56Z",
+      "repoId": 79162682,
+      "pullRequestNo": 6865
+    },
+    {
+      "name": "personalizedrefrigerator",
+      "id": 46334387,
+      "comment_id": 1362101229,
+      "created_at": "2022-12-21T21:22:16Z",
+      "repoId": 79162682,
+      "pullRequestNo": 7470
+    },
+    {
+      "name": "gtlsgamr",
+      "id": 47787284,
+      "comment_id": 1362615340,
+      "created_at": "2022-12-22T09:34:59Z",
+      "repoId": 79162682,
+      "pullRequestNo": 7515
+    },
+    {
+      "name": "halkeye",
+      "id": 110087,
+      "comment_id": 1363180252,
+      "created_at": "2022-12-22T17:52:26Z",
+      "repoId": 79162682,
+      "pullRequestNo": 6836
+    },
+    {
+      "name": "Wartijn",
+      "id": 10060747,
+      "comment_id": 1364085068,
+      "created_at": "2022-12-23T16:13:19Z",
+      "repoId": 79162682,
+      "pullRequestNo": 6886
+    },
+    {
+      "name": "betty-alagwu",
+      "id": 94234459,
+      "comment_id": 1364449008,
+      "created_at": "2022-12-24T03:08:45Z",
+      "repoId": 79162682,
+      "pullRequestNo": 7529
+    },
+    {
+      "name": "Mr-Kanister",
+      "id": 68117355,
+      "comment_id": 1364570129,
+      "created_at": "2022-12-24T18:40:22Z",
+      "repoId": 79162682,
+      "pullRequestNo": 7531
+    },
+    {
+      "name": "ken1kob",
+      "id": 16041683,
+      "comment_id": 1365087509,
+      "created_at": "2022-12-26T11:01:50Z",
+      "repoId": 79162682,
+      "pullRequestNo": 6469
+    }
+  ]
+}
--- a/yarn.lock
+++ b/yarn.lock
@@ -164,16 +164,16 @@ __metadata:
  languageName: node
  linkType: hard

-"@aws-sdk/client-s3@npm:3.235.0":
-  version: 3.235.0
-  resolution: "@aws-sdk/client-s3@npm:3.235.0"
+"@aws-sdk/client-s3@npm:3.238.0":
+  version: 3.238.0
+  resolution: "@aws-sdk/client-s3@npm:3.238.0"
  dependencies:
    "@aws-crypto/sha1-browser": 2.0.0
    "@aws-crypto/sha256-browser": 2.0.0
    "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/client-sts": 3.235.0
+    "@aws-sdk/client-sts": 3.238.0
    "@aws-sdk/config-resolver": 3.234.0
-    "@aws-sdk/credential-provider-node": 3.235.0
+    "@aws-sdk/credential-provider-node": 3.238.0
    "@aws-sdk/eventstream-serde-browser": 3.226.0
    "@aws-sdk/eventstream-serde-config-resolver": 3.226.0
    "@aws-sdk/eventstream-serde-node": 3.226.0
@@ -223,13 +223,13 @@ __metadata:
    "@aws-sdk/xml-builder": 3.201.0
    fast-xml-parser: 4.0.11
    tslib: ^2.3.1
-  checksum: b16ce0a34a4d302edbc9cae91296a90a907511d6f0985feccf2196d537e1f1bfff6bfc0dafcb7ea1d5d7d0afd79d843cc15f8a5f87debd08852de338c698169b
+  checksum: f066ad581bdbcd9595ff9226c81b59876b833d6e07dc755b6f70ec0c2c5eab909c9d009ec8faa45a60d650d553ca965f271d244d870f4a938751e65e6d521d6e
  languageName: node
  linkType: hard

-"@aws-sdk/client-sso-oidc@npm:3.235.0":
-  version: 3.235.0
-  resolution: "@aws-sdk/client-sso-oidc@npm:3.235.0"
+"@aws-sdk/client-sso-oidc@npm:3.238.0":
+  version: 3.238.0
+  resolution: "@aws-sdk/client-sso-oidc@npm:3.238.0"
  dependencies:
    "@aws-crypto/sha256-browser": 2.0.0
    "@aws-crypto/sha256-js": 2.0.0
@@ -264,13 +264,13 @@ __metadata:
    "@aws-sdk/util-utf8-browser": 3.188.0
    "@aws-sdk/util-utf8-node": 3.208.0
    tslib: ^2.3.1
-  checksum: c62558375fb6d3ce44136019de99e5134805894a80cec191e145003c0e065eb52ba0a288a62884371d6a69370f92df522b120e1c5428520c09ba0f4cdc5b91b7
+  checksum: b2f0df1168d2e20ccf1d598b76be4141b6a27068ad9dea74570aa3ab8c94c103537463c58d8296e76d2457f5afb5253cbf2b1f665411981f5939c85667dd1aff
  languageName: node
  linkType: hard

-"@aws-sdk/client-sso@npm:3.235.0":
-  version: 3.235.0
-  resolution: "@aws-sdk/client-sso@npm:3.235.0"
+"@aws-sdk/client-sso@npm:3.238.0":
+  version: 3.238.0
+  resolution: "@aws-sdk/client-sso@npm:3.238.0"
  dependencies:
    "@aws-crypto/sha256-browser": 2.0.0
    "@aws-crypto/sha256-js": 2.0.0
@@ -305,18 +305,18 @@ __metadata:
    "@aws-sdk/util-utf8-browser": 3.188.0
    "@aws-sdk/util-utf8-node": 3.208.0
    tslib: ^2.3.1
-  checksum: 9852704cc383cbc8e44013eed6de514f60dc4f70ab89ceea79971b4b286db6b923648e8e4169d248f0888efed19c7c5fcc5748177577635d07080fd4980431d7
+  checksum: dbd993e569a3858fd80222cd61e5df5813b3ef6579cfd393925679f71af57f3d9277f470d868f93dbda2f797a8e0be7da9f0678ee80a97103ea2612e2e1ef793
  languageName: node
  linkType: hard

-"@aws-sdk/client-sts@npm:3.235.0":
-  version: 3.235.0
-  resolution: "@aws-sdk/client-sts@npm:3.235.0"
+"@aws-sdk/client-sts@npm:3.238.0":
+  version: 3.238.0
+  resolution: "@aws-sdk/client-sts@npm:3.238.0"
  dependencies:
    "@aws-crypto/sha256-browser": 2.0.0
    "@aws-crypto/sha256-js": 2.0.0
    "@aws-sdk/config-resolver": 3.234.0
-    "@aws-sdk/credential-provider-node": 3.235.0
+    "@aws-sdk/credential-provider-node": 3.238.0
    "@aws-sdk/fetch-http-handler": 3.226.0
    "@aws-sdk/hash-node": 3.226.0
    "@aws-sdk/invalid-dependency": 3.226.0
@@ -350,7 +350,7 @@ __metadata:
    "@aws-sdk/util-utf8-node": 3.208.0
    fast-xml-parser: 4.0.11
    tslib: ^2.3.1
-  checksum: 9a2ec3240bd01fd1ed95b2c6766ea8d141e4b85a6535fcbb5c57ac725ef58c2d1c1403a61c336adbb1eceb5dd306ac1d35d7b8f25ed1ebc544a14ad14fb038a7
+  checksum: 323677f17a1cfec54022a7af941db636ed9201d0a188b10e367663c422d931508728705633d01943d8bd0439edc20b39b619a8dd87d2ee55f3ca2df923e4c0dc
  languageName: node
  linkType: hard

@@ -391,38 +391,38 @@ __metadata:
  languageName: node
  linkType: hard

-"@aws-sdk/credential-provider-ini@npm:3.235.0":
-  version: 3.235.0
-  resolution: "@aws-sdk/credential-provider-ini@npm:3.235.0"
+"@aws-sdk/credential-provider-ini@npm:3.238.0":
+  version: 3.238.0
+  resolution: "@aws-sdk/credential-provider-ini@npm:3.238.0"
  dependencies:
    "@aws-sdk/credential-provider-env": 3.226.0
    "@aws-sdk/credential-provider-imds": 3.226.0
    "@aws-sdk/credential-provider-process": 3.226.0
-    "@aws-sdk/credential-provider-sso": 3.235.0
+    "@aws-sdk/credential-provider-sso": 3.238.0
    "@aws-sdk/credential-provider-web-identity": 3.226.0
    "@aws-sdk/property-provider": 3.226.0
    "@aws-sdk/shared-ini-file-loader": 3.226.0
    "@aws-sdk/types": 3.226.0
    tslib: ^2.3.1
-  checksum: c910746d90ec363691dc99d53594beb49ea8562ef69c5a2e9a1702febc7d870cfe5b0f441afdae2bed643a4e8901b82f965660cdd70077bb006978fdafddeb05
+  checksum: bf792096935a915ff1bf26c53408d7265d2dd5cb2093d5b51862cf21a1418801454362842cd7c59a8738af1bb12713afb354e55d3057e92f30f2caa327ff3eb9
  languageName: node
  linkType: hard

-"@aws-sdk/credential-provider-node@npm:3.235.0":
-  version: 3.235.0
-  resolution: "@aws-sdk/credential-provider-node@npm:3.235.0"
+"@aws-sdk/credential-provider-node@npm:3.238.0":
+  version: 3.238.0
+  resolution: "@aws-sdk/credential-provider-node@npm:3.238.0"
  dependencies:
    "@aws-sdk/credential-provider-env": 3.226.0
    "@aws-sdk/credential-provider-imds": 3.226.0
-    "@aws-sdk/credential-provider-ini": 3.235.0
+    "@aws-sdk/credential-provider-ini": 3.238.0
    "@aws-sdk/credential-provider-process": 3.226.0
-    "@aws-sdk/credential-provider-sso": 3.235.0
+    "@aws-sdk/credential-provider-sso": 3.238.0
    "@aws-sdk/credential-provider-web-identity": 3.226.0
    "@aws-sdk/property-provider": 3.226.0
    "@aws-sdk/shared-ini-file-loader": 3.226.0
    "@aws-sdk/types": 3.226.0
    tslib: ^2.3.1
-  checksum: bfea379a5e66c311c57a1f7390b2e508d42f8cf3e1a48a5b9585b33c76339c7e8806dba413c7d5bf6d669ffd05a4c55ef705f92bf4687ba8f5e359c5d3c7495e
+  checksum: 7d9e56dd53db5ef1d5600502a407a81500b0dde6c2c6164c88f88dffb20a24b9e256ebd329b2afb3992fa16514173bb8509ab410d651b0e6fb6f4cb713e22d11
  languageName: node
  linkType: hard

@@ -438,17 +438,17 @@ __metadata:
  languageName: node
  linkType: hard

-"@aws-sdk/credential-provider-sso@npm:3.235.0":
-  version: 3.235.0
-  resolution: "@aws-sdk/credential-provider-sso@npm:3.235.0"
+"@aws-sdk/credential-provider-sso@npm:3.238.0":
+  version: 3.238.0
+  resolution: "@aws-sdk/credential-provider-sso@npm:3.238.0"
  dependencies:
-    "@aws-sdk/client-sso": 3.235.0
+    "@aws-sdk/client-sso": 3.238.0
    "@aws-sdk/property-provider": 3.226.0
    "@aws-sdk/shared-ini-file-loader": 3.226.0
-    "@aws-sdk/token-providers": 3.235.0
+    "@aws-sdk/token-providers": 3.238.0
    "@aws-sdk/types": 3.226.0
    tslib: ^2.3.1
-  checksum: 358fdda689c1f9be768516ca39de17e7fa7832d3d89d8893dd58f5d3377908ee2580155c1ba984c5ed21a410cda681bd22c7c74876af06b3496641a98b62353f
+  checksum: 4ac0451f85eb34eba78f4462daace270f0ff3d0d536a5093621923fc4391e9196cb500ffa382b5e4730f9562f005fb01d3cc2364dcfc9e04ce5e9715a151ce96
  languageName: node
  linkType: hard

@@ -863,9 +863,9 @@ __metadata:
  languageName: node
  linkType: hard

-"@aws-sdk/s3-request-presigner@npm:3.235.0":
-  version: 3.235.0
-  resolution: "@aws-sdk/s3-request-presigner@npm:3.235.0"
+"@aws-sdk/s3-request-presigner@npm:3.238.0":
+  version: 3.238.0
+  resolution: "@aws-sdk/s3-request-presigner@npm:3.238.0"
  dependencies:
    "@aws-sdk/middleware-endpoint": 3.226.0
    "@aws-sdk/middleware-sdk-s3": 3.231.0
@@ -876,7 +876,7 @@ __metadata:
    "@aws-sdk/util-create-request": 3.234.0
    "@aws-sdk/util-format-url": 3.226.0
    tslib: ^2.3.1
-  checksum: 30c23e3c0173f851edaa82ea55961a2bb9c8e6bc6c5c8321fb2d22e012b4b47d76ec9a3bc9bb62775fcd7e4ab0ab372a21a61fb9e415851ab24e6d5c514c8076
+  checksum: c977afe38a7c1a976b12d956c3257d4174ed4129d5708bc635ee80b29e531800111e20d1d861206ebc538f0d1398487f2db52b720965e3c95c1927a6c161cb1c
  languageName: node
  linkType: hard

@@ -940,16 +940,16 @@ __metadata:
  languageName: node
  linkType: hard

-"@aws-sdk/token-providers@npm:3.235.0":
-  version: 3.235.0
-  resolution: "@aws-sdk/token-providers@npm:3.235.0"
+"@aws-sdk/token-providers@npm:3.238.0":
+  version: 3.238.0
+  resolution: "@aws-sdk/token-providers@npm:3.238.0"
  dependencies:
-    "@aws-sdk/client-sso-oidc": 3.235.0
+    "@aws-sdk/client-sso-oidc": 3.238.0
    "@aws-sdk/property-provider": 3.226.0
    "@aws-sdk/shared-ini-file-loader": 3.226.0
    "@aws-sdk/types": 3.226.0
    tslib: ^2.3.1
-  checksum: 5b9cd8cfd697f04a7c628329af1cc5003ec25fe08626148c55389311b53ecbaa47b83f2c6b832fa847f9db2ca5a3f63bcb8a1059b1b3b3590010acf3d4610896
+  checksum: 5627cda5accc45efb50636d839ed3e6d820a139495fdc03f95cb49267d2c67182fa88d6e46a70fe9ccf34cc8a30df390ded8e94af9daeb3581c22ab0d4940ec5
  languageName: node
  linkType: hard

@@ -4371,7 +4371,7 @@ __metadata:
    react-native-file-viewer: 2.1.5
    react-native-fs: 2.20.0
    react-native-get-random-values: 1.8.0
-    react-native-image-picker: 4.10.2
+    react-native-image-picker: 4.10.3
    react-native-image-resizer: 1.4.5
    react-native-modal-datetime-picker: 14.0.1
    react-native-popup-menu: 0.16.1
@@ -4460,8 +4460,8 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@joplin/lib@workspace:packages/lib"
  dependencies:
-    "@aws-sdk/client-s3": 3.235.0
-    "@aws-sdk/s3-request-presigner": 3.235.0
+    "@aws-sdk/client-s3": 3.238.0
+    "@aws-sdk/s3-request-presigner": 3.238.0
    "@joplin/fork-htmlparser2": ^4.1.41
    "@joplin/fork-sax": ^1.2.45
    "@joplin/fork-uslug": ^1.0.6
@@ -4521,7 +4521,7 @@ __metadata:
    relative: 3.0.2
    reselect: 4.1.7
    server-destroy: 1.0.1
-    sharp: 0.31.2
+    sharp: 0.31.3
    sprintf-js: 1.1.2
    sqlite3: 5.1.4
    string-padding: 1.0.2
@@ -4548,7 +4548,7 @@ __metadata:
    "@types/jest": 29.2.4
    "@types/pdfjs-dist": 2.10.378
    "@types/react": 16.14.34
-    "@types/react-dom": 18.0.9
+    "@types/react-dom": 18.0.10
    "@types/styled-components": 5.1.25
    async-mutex: 0.4.0
    babel-jest: 29.3.1
@@ -4652,12 +4652,12 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@joplin/server@workspace:packages/server"
  dependencies:
-    "@aws-sdk/client-s3": 3.235.0
+    "@aws-sdk/client-s3": 3.238.0
    "@fortawesome/fontawesome-free": 5.15.4
    "@joplin/lib": ~2.10
    "@joplin/renderer": ~2.10
    "@joplin/tools": ~2.10
-    "@koa/cors": 4.0.0
+    "@koa/cors": 3.1.0
    "@rmp135/sql-ts": 1.15.1
    "@types/formidable": 2.0.5
    "@types/fs-extra": 9.0.13
@@ -4742,7 +4742,7 @@ __metadata:
    request: 2.88.2
    rss: 1.2.2
    sass: 1.57.1
-    sharp: 0.31.2
+    sharp: 0.31.3
    source-map-support: 0.5.21
    sqlite3: 5.1.4
    typescript: 4.9.4
@@ -4852,12 +4852,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@koa/cors@npm:4.0.0":
-  version: 4.0.0
-  resolution: "@koa/cors@npm:4.0.0"
+"@koa/cors@npm:3.1.0":
+  version: 3.1.0
+  resolution: "@koa/cors@npm:3.1.0"
  dependencies:
    vary: ^1.1.2
-  checksum: e0760544823532f2d71d792e3076858e38bab9b1c090abea175f1319fd91ea58a1da384a2fe7f5108f1c681e3830b01f62a1cafe271d6406751976af443187aa
+  checksum: b6f18de404a967696fe19c9a8d35816e2a845be51f9aa49f1a8d31bbea095eaa20c35eceafe1b764a7e3a912052ca6eaf1965ac34b00020b1ec2823cb60a9b5d
  languageName: node
  linkType: hard

@@ -7285,12 +7285,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/react-dom@npm:18.0.9":
-  version: 18.0.9
-  resolution: "@types/react-dom@npm:18.0.9"
+"@types/react-dom@npm:18.0.10":
+  version: 18.0.10
+  resolution: "@types/react-dom@npm:18.0.10"
  dependencies:
    "@types/react": "*"
-  checksum: e744e3feba25fc43733289d4df4d9c0e59fcca7f34e8c89d75f81a339accb2bd70236d69382d47d2c0ad06a1529b2e56aa6171fe175854d60e07156ddceedfcb
+  checksum: ff8282d5005a0b1cd95fb65bf79d3d8485e4cfe2aaf052129033a178684b940014a3f4536bc20d573f8a01cf4c6f4770c74988cef7c2b5cac3041d9f172647e3
  languageName: node
  linkType: hard

@@ -9085,9 +9085,9 @@ __metadata:
  languageName: node
  linkType: hard

-"aws-sdk@npm:2.1279.0":
-  version: 2.1279.0
-  resolution: "aws-sdk@npm:2.1279.0"
+"aws-sdk@npm:2.1282.0":
+  version: 2.1282.0
+  resolution: "aws-sdk@npm:2.1282.0"
  dependencies:
    buffer: 4.9.2
    events: 1.1.1
@@ -9099,7 +9099,7 @@ __metadata:
    util: ^0.12.4
    uuid: 8.0.0
    xml2js: 0.4.19
-  checksum: ee8e8ee7baea9abaa0e1d08294be8ff00795b9db606101ef69a45d1465dac936187e43079fbe7a28ff4a463c8f9cd728d9bfee3e3974b0b5b88eb437dc81295b
+  checksum: 2137a139bd1c7af9e7a3667bedc94df7f00da72af7a4e32e6c0af1cb9e658fe1860df6140798680e7b973c503c99f5180a83f8caf55cda129fa2014262dd7f14
  languageName: node
  linkType: hard

@@ -20233,7 +20233,7 @@ __metadata:
    "@types/fs-extra": 9.0.13
    "@types/jest": 29.2.4
    "@types/node": 18.11.17
-    aws-sdk: 2.1279.0
+    aws-sdk: 2.1282.0
    chalk: 4.1.2
    compare-version: 0.1.2
    fs-extra: 11.1.0
@@ -20248,7 +20248,7 @@ __metadata:
    proper-lockfile: 4.1.2
    read-chunk: 2.1.0
    server-destroy: 1.0.1
-    sharp: 0.31.2
+    sharp: 0.31.3
    sprintf-js: 1.1.2
    sqlite3: 5.1.4
    string-padding: 1.0.2
@@ -26517,13 +26517,13 @@ __metadata:
  languageName: node
  linkType: hard

-"react-native-image-picker@npm:4.10.2":
-  version: 4.10.2
-  resolution: "react-native-image-picker@npm:4.10.2"
+"react-native-image-picker@npm:4.10.3":
+  version: 4.10.3
+  resolution: "react-native-image-picker@npm:4.10.3"
  peerDependencies:
    react: "*"
    react-native: "*"
-  checksum: d6d1395a39756fad7b909c9ecd828b2d257698f5b0806be730fe56341f77de9db02b8930fb2bf5432fb726d14276cea5a7071c02753fa48dd38b0874a129abd9
+  checksum: 1f1c5cae5950790cfbdab2e1f547cfe065de9949c7cf0102dec512f43889f586eed1c265e1ecbc88df106696650b3dc5bf936b862078906787aca7e9ca2f145c
  languageName: node
  linkType: hard

@@ -28522,9 +28522,9 @@ __metadata:
  languageName: node
  linkType: hard

-"sharp@npm:0.31.2":
-  version: 0.31.2
-  resolution: "sharp@npm:0.31.2"
+"sharp@npm:0.31.3":
+  version: 0.31.3
+  resolution: "sharp@npm:0.31.3"
  dependencies:
    color: ^4.2.3
    detect-libc: ^2.0.1
@@ -28535,7 +28535,7 @@ __metadata:
    simple-get: ^4.0.1
    tar-fs: ^2.1.1
    tunnel-agent: ^0.6.0
-  checksum: 076717b7a073ea47bb522ff2931b74b6608daeb6f7ae334e4848d47fdf4d23bcb18cd49044fd5fb27ef27a1a4aa87d141894d67d1c4bb15a6e2e63cf4dbe329e
+  checksum: 29fd1dfbc616c6389f53f366cec342b4353d9f2a37e98952ca273db38dca57dfa0f336322d6d763f0fae876042ead22fd86ffe26d70c32ade2458d421db60d04
  languageName: node
  linkType: hard
Author	SHA1	Message	Date
Laurent Cozic	9a06824fde	Server v2.10.5	2022-12-26 12:09:27 +00:00
Laurent Cozic	186316bb8b	lock file	2022-12-26 11:56:47 +00:00
Laurent Cozic	5c8861cbd1	Server: Fixes #7525 : Fixed regression that would prevent styles from being loaded in published notes	2022-12-26 11:56:34 +00:00
github-actions[bot]	c710cfd273	@ken1kob has signed the CLA from Pull Request #6469	2022-12-26 11:02:08 +00:00
Mr-Kanister	3ef41016b5	All: Translation: Update de_DE.po (#7531 )	2022-12-24 21:19:15 -05:00
github-actions[bot]	85423fd835	@Mr-Kanister has signed the CLA from Pull Request #7531	2022-12-24 18:40:34 +00:00
Laurent Cozic	d690146f9f	Chore: Make it easier to test publishing notes	2022-12-24 12:30:52 +00:00
renovate[bot]	944e0ef304	Update dependency aws-sdk to v2.1282.0 (#7527 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-12-24 06:36:12 +00:00
github-actions[bot]	409dcea0c6	@betty-alagwu has signed the CLA from Pull Request #7529	2022-12-24 03:09:03 +00:00
renovate[bot]	6c20cdefd4	Update aws-sdk-js-v3 monorepo to v3.238.0 (#7526 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-12-24 01:47:48 +00:00
renovate[bot]	300f1590ba	Update dependency @types/react-dom to v18.0.10 (#7524 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-12-23 19:18:31 +00:00
github-actions[bot]	f6c2013df8	@Wartijn has signed the CLA from Pull Request #6886	2022-12-23 16:13:36 +00:00
renovate[bot]	e3dc77357c	Update dependency aws-sdk to v2.1281.0 (#7514 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-12-22 22:37:33 +00:00
github-actions[bot]	a739636ce6	@halkeye has signed the CLA from Pull Request #6836	2022-12-22 17:52:40 +00:00
Laurent Cozic	7620c2b0b7	Tools: Disable CodeMirror flaky test	2022-12-22 14:30:04 +00:00
Laurent Cozic	60c4045000	Merge branch 'dev' of github.com:laurent22/joplin into dev	2022-12-22 13:19:35 +00:00
Laurent Cozic	39fb40dc37	Merge branch 'release-2.9' into dev	2022-12-22 13:18:10 +00:00
Laurent Cozic	145cb6c41e	iOS 12.9.2	2022-12-22 12:42:38 +00:00
Laurent Cozic	de9f9985d1	Merge branch 'release-2.9' into dev	2022-12-22 12:40:57 +00:00
Laurent Cozic	23277aaf85	Mobile: Fixes #7471 : Could not attach images to notes anymore	2022-12-22 12:38:11 +00:00
Henry Heino	e9e7a1d0df	iOS: Fixes #7469 : Note viewer inertial scroll is slower than native inertial scrolling (#7470 )	2022-12-22 12:15:20 +00:00
github-actions[bot]	3453240833	@gtlsgamr has signed the CLA from Pull Request #7515	2022-12-22 09:35:15 +00:00
renovate[bot]	1882aac628	Update aws-sdk-js-v3 monorepo to v3.236.0 (#7513 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-12-22 08:59:20 +00:00
renovate[bot]	6868e7086b	Update dependency sharp to v0.31.3 (#7512 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-12-22 06:31:50 +00:00
renovate[bot]	b35eeb6626	Update dependency react-native-image-picker to v4.10.3 (#7508 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-12-22 03:45:32 +00:00
renovate[bot]	98c56818bb	Update contributor-assistant/github-action action to v2.2.1 (#7511 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-12-22 00:20:50 +00:00
github-actions[bot]	722a0df681	@personalizedrefrigerator has signed the CLA from Pull Request #7470	2022-12-21 21:22:46 +00:00
github-actions[bot]	115cf116a2	@wh201906 has signed the CLA from Pull Request #6865	2022-12-21 17:40:11 +00:00
Laurent Cozic	f34e048fad	Update cla.md	2022-12-21 17:10:54 +00:00
github-actions[bot]	a754659ab9	@laurent22 has signed the CLA from Pull Request #7510	2022-12-21 16:54:28 +00:00
github-actions[bot]	0517d1e5d6	Creating file for storing CLA Signatures	2022-12-21 16:44:53 +00:00