From f176521e0e57bf4752d5a446f1b7353287bb45cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jul 2026 10:49:49 +0000 Subject: [PATCH] Releasing 1.0.0-beta.2 --- manifest.json | 2 +- package-lock.json | 10 +++++----- package.json | 2 +- src/apps/cli/package.json | 2 +- src/apps/webapp/package.json | 2 +- src/apps/webpeer/package.json | 2 +- updates.md | 4 ++++ versions.json | 3 ++- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/manifest.json b/manifest.json index 327fbad3..bf74e7e2 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "obsidian-livesync", "name": "Self-hosted LiveSync", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "minAppVersion": "1.7.2", "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.", "author": "vorotamoroz", diff --git a/package-lock.json b/package-lock.json index b48f5434..468f3302 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "obsidian-livesync", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "obsidian-livesync", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "workspaces": [ "src/apps/cli", @@ -16211,7 +16211,7 @@ }, "src/apps/cli": { "name": "self-hosted-livesync-cli", - "version": "1.0.0-beta.0-cli", + "version": "1.0.0-beta.2-cli", "dependencies": { "chokidar": "^4.0.0", "minimatch": "^10.2.5", @@ -16236,7 +16236,7 @@ }, "src/apps/webapp": { "name": "livesync-webapp", - "version": "1.0.0-beta.0-webapp", + "version": "1.0.0-beta.2-webapp", "dependencies": { "octagonal-wheels": "^0.1.51" }, @@ -16251,7 +16251,7 @@ } }, "src/apps/webpeer": { - "version": "1.0.0-beta.0-webpeer", + "version": "1.0.0-beta.2-webpeer", "dependencies": { "octagonal-wheels": "^0.1.51" }, diff --git a/package.json b/package.json index 42c21c94..bfc09c49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "obsidian-livesync", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.", "main": "main.js", "type": "module", diff --git a/src/apps/cli/package.json b/src/apps/cli/package.json index 51e94d64..40885051 100644 --- a/src/apps/cli/package.json +++ b/src/apps/cli/package.json @@ -1,7 +1,7 @@ { "name": "self-hosted-livesync-cli", "private": true, - "version": "1.0.0-beta.0-cli", + "version": "1.0.0-beta.2-cli", "main": "dist/index.cjs", "type": "module", "scripts": { diff --git a/src/apps/webapp/package.json b/src/apps/webapp/package.json index a2d6e6a6..7f0afa88 100644 --- a/src/apps/webapp/package.json +++ b/src/apps/webapp/package.json @@ -1,7 +1,7 @@ { "name": "livesync-webapp", "private": true, - "version": "1.0.0-beta.0-webapp", + "version": "1.0.0-beta.2-webapp", "type": "module", "description": "Browser-based Self-hosted LiveSync using FileSystem API", "scripts": { diff --git a/src/apps/webpeer/package.json b/src/apps/webpeer/package.json index 16f9c47c..6f1aab67 100644 --- a/src/apps/webpeer/package.json +++ b/src/apps/webpeer/package.json @@ -1,7 +1,7 @@ { "name": "webpeer", "private": true, - "version": "1.0.0-beta.0-webpeer", + "version": "1.0.0-beta.2-webpeer", "type": "module", "scripts": { "dev": "vite", diff --git a/updates.md b/updates.md index 967b9cbf..455c1de2 100644 --- a/updates.md +++ b/updates.md @@ -12,6 +12,10 @@ Earlier releases remain available in the [0.25 release history](https://github.c ## Unreleased +## 1.0.0-beta.2 + +23rd July, 2026 + ### Improved - Choosing **Not now** on a merge conflict now postpones repeated dialogues for that conflict while the active file retains an unresolved-conflict warning. Three or more live versions show their current count and are reviewed one deterministic pair at a time; completed pairs remain resolved across restart. The existing conflict commands can reopen a postponed conflict explicitly, and a later conflict prompts again after the current one has been resolved. diff --git a/versions.json b/versions.json index 3c168a92..a0f3dfb2 100644 --- a/versions.json +++ b/versions.json @@ -7,5 +7,6 @@ "0.25.82": "1.7.2", "0.25.83": "1.7.2", "1.0.0-beta.0": "1.7.2", - "1.0.0-beta.1": "1.7.2" + "1.0.0-beta.1": "1.7.2", + "1.0.0-beta.2": "1.7.2" }