$ git fetch upstream && git rev-list --count HEAD..upstream/master
12
Every week behind makes the rebase harder, and the harness controls now run against 1.10.8 behaviour (see the pinned-image issue). The forms container is meant to receive core via pip from this branch (#20), so it inherits whatever is here.
What
Upstream master is at
35d3638de(1.10.8, 2026-09-07). FORK.md says the branch "tracks jhpyle/docassemble master". The behind commits collide with carried work:c1e3a98bemerges this fork's issue-980 fix upstream. Fork commit24b027530becomes a duplicate and should be dropped. TODO.md item "Watch upstream PR Fix AttributeError when 'main page title url opens in other window' is boolean jhpyle/docassemble#983" is done.dda259d2aand693e31faeadd upstream's own skip link (tabindex="0"),role="main" tabindex="-1"on#damain, and an aria-live flash region. These overlap the fork's Accessibility for self-represented litigants: skip link, 404 landmark, print stylesheet #18 work inbase.html,app.cssand404.html.693e31faerewritesbundle.shto concatenate locally instead ofwgetfrom a running server, and removes the bootstrap-fileinput plugin.2a586e690replaces labelauty with CSS, which makes the fork's labelauty selector-escaper commitb49198de4, thebundle.shlabelauty entry, and the labelauty CodeQL exclusion moot.base.htmlnow gates OG tags on'image' in config['SOCIAL']['og']and loads FontAwesome asjs/all.min.js; the fork's SEO for public interview pages: description, canonical, OG, sitemap, robots #15 (ungated OG) and Page weight on public interview pages: 1.5 MB FontAwesome + 259 KB admin bundle loaded unconditionally #19 (CSS webfont build) change the same two lines.Why it matters
Every week behind makes the rebase harder, and the harness controls now run against 1.10.8 behaviour (see the pinned-image issue). The forms container is meant to receive core via pip from this branch (#20), so it inherits whatever is here.
Done when
git rebase upstream/master jacob/maintainedcompletes;24b027530and the labelauty escaper are dropped with a note in the commit that upstream carries them.