mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2026-03-08 16:00:36 -07:00
Introduce end-to-end tests and server-side support for mobile-style Smart HTTP git sync. Adds a new mobileSyncConflict.feature and extended sync.step definitions to simulate HTTP clone/sync cycles, pushes, and assertions (including file content checks and HTTP readiness/backoff). Introduces src/services/gitServer/mergeUtilities.ts to resolve .tid conflicts (mobile metadata wins, body merged) and common git helpers, and wires those into the git server (use runGitCollectStdout, DESKTOP_GIT_IDENTITY, and mergeAfterPush endpoint). Misc: update workspace restart flow and settings handling, tweak test helpers (skip screenshot capture for file steps), adjust slugify rules, minor UI/formatting change, and bump git-sync-js dependency (with lockfile update). |
||
|---|---|---|
| .. | ||
| agent.ts | ||
| application.ts | ||
| browserView.ts | ||
| cleanup.ts | ||
| logging.ts | ||
| menu.ts | ||
| sync.ts | ||
| tidgiMiniWindow.ts | ||
| ui.ts | ||
| wiki.ts | ||
| window.ts | ||