logseq

mirror of https://github.com/logseq/logseq.git synced 2026-05-27 06:04:23 +00:00

Files

scheinriese c438798984 Merge origin/master into feat/unified-icon-picker

Brings 1,081 master commits forward. 19 file-level conflicts resolved.
Major master-side changes integrated:

* Migrate yarn → pnpm (package.json + pnpm-lock.yaml)
* Closure compiler upgrade → requires Java 21 runtime
* Recycle-bin properties + delete embedding properties (migrations 65.24/65.25)
* block-renderer plugin replacement infrastructure (block.cljs ~3600-4150)
* Enhanced breadcrumb display (commit 51f0ce261c)
* Heading icon alignment + menu active state (755840c474)
* Scoped choice + sanitize-property-values-for-display in property/config
* Sub-menu Set-icon context menu items
* TooltipArrow / electron handler refactor

Migration renumber: our 65.24-29 → 65.26-31 (after master's 65.24-25).
Schema version bumped to 65.31.

Post-merge fixes (build cleanliness):
- hsl2hex: re-add to util.cljc (master removed; colors.cljs still uses it)
- <unlink-asset: re-add to handler/assets.cljs (master removed; outliner
  pipeline's asset-file unlink still uses it)
- en.edn: dedupe 25 identical keys that survived the conflict resolution
- icon.cljs: drop the duplicate get-used-items / add-used-item! that
  master added (HEAD has v2-storage versions further down with type-aware
  dedup + renderable filtering — preferred)
- block.cljs: restore the inline page-ref avatar size default for
  non-heading contexts (master commit 755840c474 forced 14px via
  ; revert so photo-icons keep their 20px default
  while headings still get heading-aware sizing)
- left_sidebar.cljs: keep master's left-sidebar-resized-at as a real
  binding (not _-prefixed) since the page-title-content fn uses it

Smoke-tested: theme toggle, icon picker, asset delete, page-title
icons, sidebar refs. Outstanding visual issues from master's CSS
changes (icon alignment drift in inline refs, breadcrumb [[]] raw
brackets) tracked as separate follow-up commits.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

2026-05-13 17:54:31 +02:00