self-hosted/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2024-12-12 09:04:06 +02:00
Code Issues Releases Activity

0.24.0.dev-rc6

Browse Source
This commit is contained in:
vorotamoroz 2024-10-22 10:08:20 +01:00
parent 6d244a6e34
commit 5b4ae37030
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifest-beta.json
View File

@ -1,7 +1,7 @@
{
"id": "obsidian-livesync",
"name": "Self-hosted LiveSync",
"version": "0.24.0.dev-rc5",
"version": "0.24.0.dev-rc6",
"minAppVersion": "0.9.12",
"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",

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "obsidian-livesync",
"version": "0.24.0.dev-rc5",
"version": "0.24.0.dev-rc6",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "obsidian-livesync",
"version": "0.24.0.dev-rc5",
"version": "0.24.0.dev-rc6",
"license": "MIT",
"dependencies": {
"@aws-sdk/client-s3": "^3.645.0",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "obsidian-livesync",
"version": "0.24.0.dev-rc5",
"version": "0.24.0.dev-rc6",
"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",

5
src/features/HiddenFileCommon/JsonResolveModal.ts
View File

@ -32,9 +32,12 @@ export class JsonResolveModal extends Modal {
this.hideLocal = hideLocal ?? false;
void waitForSignal(`cancel-internal-conflict:${filename}`).then(() => this.close());
}
async UICallback(keepRev?: string, mergedStr?: string) {
if (this.callback) {
await this.callback(keepRev, mergedStr);
}
this.close();
await this.callback?.(keepRev, mergedStr);
this.callback = undefined;
}

7
updates.md
View File

@ -23,6 +23,13 @@ Thank you, and I hope your troubles will be resolved!
---
## 0.24.0.dev-rc6
### Fixed
- We can resolve the conflict of the JSON file correctly now.
- This would be the final Release Candidate.
## 0.24.0.dev-rc5
### Improved