Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

group = "info.socrtwo.quillpost"
version = "1.5.0"
version = "1.6.0"

repositories {
google()
Expand Down Expand Up @@ -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).
Expand Down
6 changes: 3 additions & 3 deletions ios/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion web/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

group = "info.socrtwo.quillpost"
version = "1.5.0"
version = "1.6.0"

repositories {
mavenCentral()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion web/src/main/resources/web/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href='https://ollama.com' target='_blank' rel='noopener'>ollama.com</a>, then run <code>ollama pull llama3.2</code> (or any other model) on the machine that hosts QuillPost." }));
host.appendChild(el("p", { class: "small muted", html: "Install from <a href='https://ollama.com' target='_blank' rel='noopener'>ollama.com</a>, then run <code>ollama pull llama3.2</code> (or any other model) on the machine that hosts Anne\'s Post." }));
},
};

Expand Down
4 changes: 2 additions & 2 deletions web/src/main/resources/web/embed.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading