Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
manuerwin committed Jan 25, 2024
2 parents 232d32a + 1906dad commit 61b026d
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 24 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## not released

## v1.4.0 (2024-01-25)

feat: more information on settings page for users

## v1.3.2 (2024-01-24)

chore: Bump dependencies (follow-redirects, node-fetch and @joplin/lib, plus npm update)
Expand Down
77 changes: 59 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "joplin-plugin-attache",
"version": "1.3.2",
"version": "1.4.0",
"scripts": {
"dist": "webpack --env joplin-plugin-config=buildMain && webpack --env joplin-plugin-config=buildExtraScripts && webpack --env joplin-plugin-config=createArchive",
"prepare": "npm run dist",
Expand Down Expand Up @@ -42,7 +42,7 @@
"typescript": "^4.8.2",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0",
"yargs": "^16.2.0"
"yargs": "^17.7.2"
},
"browser": {
"fs": false
Expand Down
2 changes: 1 addition & 1 deletion src/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 1,
"id": "io.github.manuerwin.attache",
"app_min_version": "2.13.13",
"version": "1.3.2",
"version": "1.4.0",
"name": "Attaché",
"description": "Your attachment updater. Mass replacement of Joplin attachments (resources) such as resized image files, current music playlists, and any other attachments you need to one-off or regularly update within Joplin.",
"author": "Manu Erwin",
Expand Down
6 changes: 3 additions & 3 deletions src/replaceResourcesSetup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export async function registerSettings(): Promise<void> {
await joplin.settings.registerSection("AttachéSection", {
label: "Attaché",
iconName: "fas fa-exchange-alt",
description: "RESTART JOPLIN AFTER CHANGING THESE SETTINGS!",
description: "See https://github.com/manuerwin/joplin-plugin-attache for documentation. RESTART JOPLIN AFTER CHANGING THESE SETTINGS!",
});

await joplin.settings.registerSettings({
Expand All @@ -20,7 +20,7 @@ export async function registerSettings(): Promise<void> {
subType: SettingItemSubType.DirectoryPath,
section: "AttachéSection",
public: true,
label: "Choose the location of files that will replace your resources.",
label: "Choose the location of files that will replace your resources. (REQUIRED)",
},
});

Expand All @@ -30,7 +30,7 @@ export async function registerSettings(): Promise<void> {
type: SettingItemType.Bool,
section: "AttachéSection",
public: true,
label: "Run on start and after sync",
label: "Run on start and after sync (OPTIONAL)",
description:
"If checked true, Attaché will run immediately after Joplin starts and after each synchronisation. The default value is unchecked (false).",
},
Expand Down

0 comments on commit 61b026d

Please sign in to comment.