Skip to content

Upstream sync to 15.10.5 with pasted-image fixes - #5

Merged
dvdl16 merged 11 commits into
version-15-rcfrom
sync/upstream-15.10.5
Sep 24, 2026
Merged

dvdl16 merged 11 commits into
version-15-rcfrom
sync/upstream-15.10.5

Conversation

@dvdl16

@dvdl16 dvdl16 commented Sep 24, 2026

Copy link
Copy Markdown

Replaces #4.

Merges fix/images-in-comments-emails (agritheory PR agritheory#147, rebased on agritheory version-15 at 15.10.5) into version-15-rc.

#4 showed as conflicting on GitHub even though git merge is clean with every strategy. The two branches have two merge bases (56d907d and 47654f1) from the earlier criss-cross merges of fork PRs #1 and #2. Git builds a virtual base and merges cleanly; GitHub picks a single base and conflicts in file.py and test_file.py. This branch carries the locally resolved merge so the PR has a single base. The fix branch itself is left untouched so agritheory#147 stays clean.

Merged tree is identical to the fix branch apart from this fork's __version__ = "15.7.4" line.

🤖 Generated with Claude Code

lauty95 and others added 11 commits August 26, 2026 08:43
* test: clean up uploaded files after each test session

* ci: pre-commit updated

* fix(file): validate resolved path before local-disk get_content() to block path traversal

* fix(file): prevent sibling-path traversal in local get_conten
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JdVodpzz8zmCAFWajejQdL
…ng-files

fix: set file_url so attach field doesn't remain blank
Automatically generated by python-semantic-release
Automatically generated by python-semantic-release
…-comments-emails

# Conflicts:
#	cloud_storage/cloud_storage/overrides/file.py
… to 15.10.5)

Brings agritheory version-15 through 15.10.5 plus the pasted-image fixes
from PR agritheory#147, including the follow-up that repoints the merged File at the
surviving name so local fid lookups resolve.

Opened as a separate sync branch because the fix branch and version-15-rc
have two merge bases (criss-cross history). Git merges them cleanly with a
virtual base, but GitHub picks a single base and reports a conflict on the
direct PR (#4), so this branch carries the resolved merge instead.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@dvdl16 dvdl16 mentioned this pull request Sep 24, 2026
@dvdl16
dvdl16 merged commit a12f7bd into version-15-rc Sep 24, 2026
2 of 3 checks passed
@github-actions

Copy link
Copy Markdown

Coverage

Coverage Report
FileStmtsMissCoverMissing
__init__.py17571%24–25, 31–33
commands.py35350%4–6, 9–11, 17–20, 23, 26–27, 49–51, 53–54, 56, 65, 68–72, 75–76, 85–87, 89–90, 92, 94, 97
hooks.py160100% 
install.py440%4, 6, 9–10
migration.py19611541%25, 46, 68–69, 88–89, 96, 115, 123–125, 158–159, 161–162, 166–168, 171–172, 187, 196–197, 199–203, 205–210, 212, 219–221, 223, 225–226, 228, 235–236, 238–242, 244–247, 249, 254–257, 259–268, 270–279, 281–282, 284–285, 287–288, 290–294, 298–301, 305, 307–308, 310, 312–314, 317–318, 320–321, 323–329, 331–332, 334, 336
permissions.py20385%14, 19, 21
system_packages.py34340%4, 11, 13–15, 17, 20–21, 24–27, 37–38, 48, 50–55, 57–59, 61–62, 66–69, 71–74
cloud_storage
   __init__.py00100% 
cloud_storage/doctype
   __init__.py00100% 
cloud_storage/doctype/file_association
   __init__.py00100% 
   file_association.py30100% 
cloud_storage/doctype/file_version
   __init__.py00100% 
   file_version.py30100% 
cloud_storage/overrides
   file.py46013072%96, 111, 121, 155, 175, 192, 200–201, 214, 218–219, 231–232, 241, 249–250, 265, 270, 277, 356–365, 367–375, 386, 392–393, 401–403, 405, 417, 419, 435, 452–453, 456, 459, 488, 533, 536, 575, 581, 587, 593, 599, 605, 615, 617–619, 623, 631–633, 635, 653, 668–672, 678–679, 681, 704–708, 720–721, 770, 773–782, 789–790, 792–794, 797–798, 803–805, 807, 812–815, 820, 822, 834–835, 837, 842–846, 848, 859–865
config
   __init__.py00100% 
   desktop.py330%4, 7–8
   docs.py660%4, 6–8, 12–13
tests
   conftest.py62395%55, 101–102
   fixtures.py30100% 
   test_file.py256399%88, 195, 359
   test_file_permissions.py390100% 
   test_file_preview.py630100% 
   test_local_storage.py1140100% 
TOTAL133434174% 

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants