mirror of
https://github.com/logseq/logseq.git
synced 2026-05-27 14:14:24 +00:00
Brings 99 new master commits forward. 5 file-level conflicts resolved: - deps/db/src/logseq/db/frontend/schema.cljs — bumped version to "65.32" to accommodate both sides' migration chains - src/main/frontend/worker/db/migrate.cljs — both branches defined a 65.26 migration; renumbered master's :logseq.property.repeat/repeat-type to 65.32 after my 65.26..65.31 chain - src/main/frontend/components/content.cljs — dropped master's debug prn (commit "remove debug print"); kept HEAD's indentation - src/main/frontend/components/icon.cljs — kept HEAD's refactor of emoji-cp into type-dispatched emoji/icon/text/avatar components + render-item dispatcher; master's simpler emoji-cp would break the item-render call site - .agents/skills/logseq-task-on-lambda/SKILL.md — took master's updated skill doc verbatim (not my work area) Re-added /.claude/plans/ to .gitignore after auto-merge picked master's rewrite of /.claude → /.claude/settings.local.json and dropped my prior ignore rule. Compile verified clean against shadow-cljs :app and :test builds (0 new warnings). App loads in browser without runtime errors. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>