diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 04d4180..9641ecc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,8 +28,8 @@ android { applicationId = "io.github.socrtwo.quillpost" minSdk = 26 targetSdk = 35 - versionCode = 6 - versionName = "1.5.0" + versionCode = 7 + versionName = "1.6.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary = true } diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index f03871b..b1c446e 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "info.socrtwo.quillpost" -version = "1.5.0" +version = "1.6.0" repositories { google() @@ -63,7 +63,7 @@ compose.desktop { // .dmg builds on macOS, .msi on Windows, .deb on Linux (x64 and arm64 / Raspberry Pi OS). targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) packageName = "QuillPost" - packageVersion = "1.5.0" + packageVersion = "1.6.0" description = "Anne's Post email client with junk protection" vendor = "socrtwo" // JDK modules the embedded server needs (Netty, TLS, logging, the tray icon). diff --git a/ios/project.yml b/ios/project.yml index 505e605..b7982eb 100644 --- a/ios/project.yml +++ b/ios/project.yml @@ -13,8 +13,8 @@ targets: path: QuillPost/Info.plist properties: CFBundleDisplayName: Anne's Post - CFBundleShortVersionString: "1.5.0" - CFBundleVersion: "6" + CFBundleShortVersionString: "1.6.0" + CFBundleVersion: "7" UILaunchScreen: UIColorName: LaunchBackground UIImageName: LaunchLogo @@ -81,7 +81,7 @@ targets: settings: base: PRODUCT_BUNDLE_IDENTIFIER: io.github.socrtwo.quillpost - MARKETING_VERSION: "1.5.0" + MARKETING_VERSION: "1.6.0" CURRENT_PROJECT_VERSION: 6 TARGETED_DEVICE_FAMILY: "1,2" SWIFT_VERSION: "5.0" diff --git a/web/build.gradle.kts b/web/build.gradle.kts index dec257c..828de2a 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "info.socrtwo.quillpost" -version = "1.5.0" +version = "1.6.0" repositories { mavenCentral() diff --git a/web/src/main/kotlin/info/socrtwo/quillpost/web/FileRoutes.kt b/web/src/main/kotlin/info/socrtwo/quillpost/web/FileRoutes.kt index e5d9eb7..2bee3b7 100644 --- a/web/src/main/kotlin/info/socrtwo/quillpost/web/FileRoutes.kt +++ b/web/src/main/kotlin/info/socrtwo/quillpost/web/FileRoutes.kt @@ -24,7 +24,7 @@ import kotlinx.serialization.Serializable import java.time.ZoneId // --------------------------------------------------------------------------------------- -// "Open file": any message, contact, calendar or office file dropped on or opened in QuillPost. +// "Open file": any message, contact, calendar or office file dropped on or opened in Anne's Post. // --------------------------------------------------------------------------------------- @Serializable diff --git a/web/src/main/kotlin/info/socrtwo/quillpost/web/fileformats/DocumentFormats.kt b/web/src/main/kotlin/info/socrtwo/quillpost/web/fileformats/DocumentFormats.kt index 53ec74d..7e35563 100644 --- a/web/src/main/kotlin/info/socrtwo/quillpost/web/fileformats/DocumentFormats.kt +++ b/web/src/main/kotlin/info/socrtwo/quillpost/web/fileformats/DocumentFormats.kt @@ -3,7 +3,7 @@ package info.socrtwo.quillpost.web.fileformats /** * Recognises word-processor, spreadsheet and presentation files by their content (the file * extension only breaks ties or names formats that have no signature), so Anne's Post can offer - * the suite program that opens them: Anne's Pen, Anne's Grid or QuillStage. + * the suite program that opens them: Anne's Pen, Anne's Grid or Anne's Stage. */ object DocumentFormats { diff --git a/web/src/main/resources/web/app.js b/web/src/main/resources/web/app.js index 1dd04cb..e0a8be3 100644 --- a/web/src/main/resources/web/app.js +++ b/web/src/main/resources/web/app.js @@ -2124,7 +2124,7 @@ const settingsUI = { catch (e) { status.textContent = "Not reachable: " + e.message; } } }, "Test connection"), el("button", { class: "btn primary", onclick: async () => { await settingsSave({ ...state.settings, ollama: { enabled: state.settings.ollama?.enabled || false, url: url.value.trim(), model: model.value.trim() } }); toast("Saved"); } }, "Save"), status)); - host.appendChild(el("p", { class: "small muted", html: "Install from ollama.com, then run ollama pull llama3.2 (or any other model) on the machine that hosts QuillPost." })); + host.appendChild(el("p", { class: "small muted", html: "Install from ollama.com, then run ollama pull llama3.2 (or any other model) on the machine that hosts Anne\'s Post." })); }, }; diff --git a/web/src/main/resources/web/embed.js b/web/src/main/resources/web/embed.js index e2d0fb3..ab05cd2 100644 --- a/web/src/main/resources/web/embed.js +++ b/web/src/main/resources/web/embed.js @@ -143,12 +143,12 @@ const quillPen = (() => { // ------------------------------------------------------------------ opening and closing async function open() { - if (!state.compose) { toast("Start a message first, then open it in QuillPen."); return false; } + if (!state.compose) { toast("Start a message first, then open it in Anne\'s Pen."); return false; } if (frame) { frame.focus(); return true; } const found = await detect(); if (!found.available || !found.base) { toast("Anne\'s Pen is not available. Install it, or set it up in Settings ▸ Compose and reply.", { danger: true }); return false; } if (!state.compose) return false; - if (state.compose.plain) { toast("This message is plain text. Switch it to HTML (Format text ▸ HTML) to edit it in QuillPen.", { danger: true }); return false; } + if (state.compose.plain) { toast("This message is plain text. Switch it to HTML (Format text ▸ HTML) to edit it in Anne\'s Pen.", { danger: true }); return false; } removeOffer(); const dlg = $("composeDialog"), editor = $("cEditor"); originalHtml = editor.innerHTML; mirrorHtml = originalHtml;