Commit Graph
15 Commits
Author SHA1 Message Date
windyboy 86c6088819 vault backup: 2026-04-13 11:01:33 2026-04-13 11:01:33 +08:00
windyboy 7b618fa305 vault backup: 2026-03-23 16:42:49 2026-03-23 16:42:49 +08:00
windyboy 1e3905d304 vault backup: 2026-02-25 16:53:37 2026-02-25 16:53:37 +08:00
windyboyandClaude Sonnet 4.6 a2249c8d96 Resolve merge conflicts - keep local plugin versions and settings
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
2026-02-24 08:19:53 +08:00
windyboy 68182b70fd vault backup: 2026-02-24 07:55:02 2026-02-24 07:55:02 +08:00
windyboy cd4ebb7e44 vault backup: 2026-02-04 18:01:06 2026-02-04 18:01:06 +08:00
windyboyandClaude Sonnet 4.5 e1db1b4259 Merge branch 'origin/main' into main
Resolved conflicts in:
- .claude/settings.json (kept local permissions)
- .obsidian/community-plugins.json (merged both plugin lists)
- .obsidian/plugins/obsidian-excalidraw-plugin/manifest.json (kept newer version 2.20.2)
- .obsidian/plugins/claudian/main.js (used simpler dependency paths)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2026-02-04 13:46:49 +08:00
windyboy 167eb9ac9c vault backup: 2026-02-04 13:41:36 2026-02-04 13:41:36 +08:00
windyboyandClaude Sonnet 4.5 37b29f36b3 Update Claudian plugin and configuration settings
- Update Claudian plugin to latest version (main.js, manifest.json, styles.css)
- Merge community plugins list with remote changes
- Update Claude Code settings and core plugins configuration

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2026-01-31 08:43:30 +08:00
windyboy bf57be8355 vault backup: 2026-01-30 10:38:04 2026-01-30 10:38:04 +08:00
windyboy f7aacd5bd4 vault backup: 2026-01-26 17:57:11 2026-01-26 17:57:11 +08:00
windyboy 2a20569162 Merge remote changes with local updates - resolve plugin conflicts 2026-01-21 10:04:59 +08:00
windyboy 4add1512a9 210126 2026-01-21 08:46:13 +08:00
windyboy 677eac7c0c vault backup: 2026-01-05 19:25:56 2026-01-05 19:25:56 +08:00
windyboy be7c6cdcc9 vault backup: 2026-01-05 13:03:55 2026-01-05 13:03:55 +08:00