Skip to content

[Promote][attachments #1] feat(attachments): drag/drop sort ordering for post media & files (create + edit) (#306) - #311

Merged
lopugit merged 4 commits into
mainfrom
promote/pr-306-media-files-sort-drag-drop-1f75a0--to-main
Aug 21, 2026
Merged

[Promote][attachments #1] feat(attachments): drag/drop sort ordering for post media & files (create + edit) (#306)#311
lopugit merged 4 commits into
mainfrom
promote/pr-306-media-files-sort-drag-drop-1f75a0--to-main

Conversation

@lopugit

@lopugit lopugit commented Aug 18, 2026

Copy link
Copy Markdown
Owner

Automated promotion of #306 from develop to main, opened by the Promote features to main workflow for release review.

Source

Source PR #306 — feat(attachments): drag/drop sort ordering for post media & files (create + edit)
Author @lopugit
Merged into develop 2026-08-18T12:48:54Z
Merge commit 08f2e9aec28437b3e44995abe3119cc389958bf8
Head branch claude/media-files-sort-drag-drop-1f75a0

How to review

  • This PR re-applies the source PR's exact changes onto main
    (git cherry-pick -x; each commit message references the original SHA).
  • Merge it normally to release the change to main
    the Sync main into develop workflow keeps develop aligned afterwards.
  • Close it (without merging) to keep the change out of main;
    the workflow never recreates a closed promotion (reopen it to change your mind).
  • Prefer shipping everything at once? Merge the standing omnibus
    Promote develop to main PR instead — this PR's diff then becomes
    empty and the workflow closes it automatically.

🤖 Generated by the promote-features-to-main workflow.

…p-1f75a0

feat(attachments): drag/drop sort ordering for post media & files (create + edit)

(cherry picked from commit 08f2e9a)
@lopugit lopugit added the promotion Automated develop to main promotion PR label Aug 18, 2026
@vercel

vercel Bot commented Aug 18, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
thingtime Ready Ready Preview Aug 21, 2026 6:03am

Request Review

@github-actions

Copy link
Copy Markdown
Contributor

Source-lineage verification currently passes.

Source PR #306's exact patch is provably present at the current develop tip 08f2e9aec28437b3e44995abe3119cc389958bf8.

lopugit added a commit that referenced this pull request Aug 18, 2026
…g/drop sort ordering for post media & files (create + edit) (#306)
lopugit added a commit that referenced this pull request Aug 18, 2026
…g/drop sort ordering for post media & files (create + edit) (#306)
github-actions Bot added a commit that referenced this pull request Aug 18, 2026
…g/drop sort ordering for post media & files (create + edit) (#306)
github-actions Bot added a commit that referenced this pull request Aug 19, 2026
…g/drop sort ordering for post media & files (create + edit) (#306)
@github-actions

github-actions Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

🤝 Merged main into promote/pr-306-media-files-sort-drag-drop-1f75a0--to-main — conflicts auto-resolved by the resolve-pr-conflicts workflow.

Conflicted files:

  • remix/app/components/Attachments/AttachmentComposer.tsx

Please review the merge commit before relying on it.

…main (AI-resolved conflicts)

Conflicted paths: remix/app/components/Attachments/AttachmentComposer.tsx

Resolved by the resolve-pr-conflicts workflow: https://github.com/lopugit/thingtime/actions/runs/32398058315

Co-Authored-By: Claude <noreply@anthropic.com>
@github-actions

github-actions Bot commented Aug 21, 2026

Copy link
Copy Markdown
Contributor

⚠️ The resolver stopped in a later safety, verification, or publication step. No residual conflicted paths were confirmed; see the workflow run.

github-actions Bot added a commit that referenced this pull request Aug 21, 2026
…g/drop sort ordering for post media & files (create + edit) (#306)
@github-actions

github-actions Bot commented Aug 21, 2026

Copy link
Copy Markdown
Contributor

🤝 Merged main into promote/pr-306-media-files-sort-drag-drop-1f75a0--to-main — conflicts auto-resolved by the resolve-pr-conflicts workflow.

Conflicted files:

  • remix/app/api/utils/attachments/attachmentStore.ts
  • remix/app/api/utils/messenger/messenger.ts
  • remix/app/api/utils/things/things.ts

Please review the merge commit before relying on it.

…main (AI-resolved conflicts)

Conflicted paths: remix/app/api/utils/attachments/attachmentStore.ts, remix/app/api/utils/messenger/messenger.ts, remix/app/api/utils/things/things.ts

Resolved by the resolve-pr-conflicts workflow: https://github.com/lopugit/thingtime/actions/runs/32448029239

Co-Authored-By: Claude <noreply@anthropic.com>
github-actions Bot added a commit that referenced this pull request Aug 21, 2026
…g/drop sort ordering for post media & files (create + edit) (#306)
@lopugit
lopugit enabled auto-merge August 21, 2026 05:51
@lopugit
lopugit merged commit 62bd842 into main Aug 21, 2026
25 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

promotion Automated develop to main promotion PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant