Merge branch 'develop'

.github/workflows/buildAndTest.yml

@@ -0,0 +1,14 @@
+name: Build and test
+on: [push, pull_request]
+jobs:
+  buildAndTest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "16"
+      - name: Install dependencies
+        run: npm install
+      - name: Build
+        run: npm run dist

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## not released
 
+## v1.2.2 (2024-01-11)
+
+- Add: Screenshots / icon for [https://joplinapp.org/plugins/](https://joplinapp.org/plugins/)
+
 ## v1.2.1 (2023-11-19)
 
 - Add: Option to preserve source note title in the combined note text

GENERATOR_DOC.md

@@ -7,7 +7,7 @@ This documentation describes how to create a plugin, and how to work with the pl
 First, install [Yeoman](http://yeoman.io) and generator-joplin using [npm](https://www.npmjs.com/) (we assume you have pre-installed [node.js](https://nodejs.org/)).
 
 ```bash
-npm install -g yo
+npm install -g yo@4.3.1
 npm install -g generator-joplin
 ```
 

README.md

@@ -1,8 +1,8 @@
-# Joplin Combine notes
+# Joplin Combine notes <img src=img/icon_32.png>
 
 Plugin to combine one or more notes to a new one.
 
-<img src=img/main.jpg>
+<img src=img/main.png>
 
 ## Installation
 

api/types.ts

@@ -586,23 +586,13 @@ export enum ContentScriptType {
 	 * ```javascript
 	 * const response = await webviewApi.postMessage(contentScriptId, message);
 	 * ```
-<<<<<<< HEAD
 	 *
 	 * - `contentScriptId` is the ID you've defined when you registered the
 	 *   content script. You can retrieve it from the
 	 *   {@link ContentScriptContext | context}.
 	 * - `message` can be any basic JavaScript type (number, string, plain
 	 *   object), but it cannot be a function or class instance.
 	 *
-=======
-	 *
-	 * - `contentScriptId` is the ID you've defined when you registered the
-	 *   content script. You can retrieve it from the
-	 *   {@link ContentScriptContext | context}.
-	 * - `message` can be any basic JavaScript type (number, string, plain
-	 *   object), but it cannot be a function or class instance.
-	 *
->>>>>>> develop
 	 * When you post a message, the plugin can send back a `response` thus
 	 * allowing two-way communication:
 	 *
@@ -621,6 +611,16 @@ export enum ContentScriptType {
 	 *
 	 * To include a regular Markdown-It plugin, that doesn't make use of any
 	 * Joplin-specific features, you would simply create a file such as this:
+	 *
+	 * ```javascript
+	 * module.exports = {
+	 *     default: function(context) {
+	 *         return {
+	 *             plugin: require('markdown-it-toc-done-right');
+	 *         }
+	 *     }
+	 * }
+	 * ```
 	 */
 	MarkdownItPlugin = 'markdownItPlugin',