Skip to content

fix: Resolve PR #89 merge conflict - correct photo flow #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Foundup merged 46 commits into from
Nov 11, 2025
Merged

fix: Resolve PR #89 merge conflict - correct photo flow #90

Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
55620b3
fix(gotjunk): Fix icon visibility on map with dark backgrounds
Foundup Nov 8, 2025
9ab1254
fix(gotjunk): Fix classification bug and add duplicate item debugging
Foundup Nov 8, 2025
3a7d635
fix(gotjunk): Add body scroll lock to PigeonMapView
Foundup Nov 8, 2025
488727d
feat(gotjunk): Adaptive sidebar icon visibility on map view
Foundup Nov 8, 2025
60bdd41
fix(gotjunk): Ensure sidebar floats above map with pointer events
Foundup Nov 8, 2025
07bd28d
Resolve merge conflict: keep getButtonStyle() helper for adaptive sty…
Foundup Nov 8, 2025
7161ed4
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 8, 2025
a943e66
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 8, 2025
c533506
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 8, 2025
3cc696a
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 8, 2025
250f696
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 8, 2025
3f48095
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 8, 2025
0cc7992
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 8, 2025
e31d586
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 8, 2025
bc720e4
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
1429b14
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
78c1584
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
8ad26d2
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
435c44a
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
01832ae
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
01fc8e4
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
d7cfb92
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
5cc0b06
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
8a75787
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
0c666cf
Merge branches 'main' and 'main' of https://github.com/Foundup/Foundu…
Foundup Nov 9, 2025
5d8d1d1
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
7edb89d
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
ba94ea4
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
bfe7dfd
docs(gotjunk): Update ModLog with 2025-11-09 session changes
Foundup Nov 9, 2025
cb510aa
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
23d6562
fix(gotjunk): Prevent duplicate item creation race condition
Foundup Nov 9, 2025
302e9b2
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 9, 2025
5c94a40
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Foundup Nov 10, 2025
8ae4628
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Nov 10, 2025
4ae8ffd
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Nov 10, 2025
7cf19d6
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Nov 10, 2025
617e615
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Nov 10, 2025
5fec960
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Nov 10, 2025
59299bd
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Nov 10, 2025
f1958f9
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Nov 10, 2025
9dbdd88
Merge branches 'main' and 'main' of https://github.com/Foundup/Foundu…
Nov 10, 2025
56f5a6d
Merge branch 'main' of https://github.com/Foundup/Foundups-Agent
Nov 11, 2025
2a02521
fix(gotjunk): Revert classification modal vibecoding - restore quick-…
Nov 11, 2025
107db26
fix(gotjunk): Hide camera orb on Browse tab - Occam's Razor UX improv…
Nov 11, 2025
709bc01
feat(gotjunk): Refactor photo flow - Items populate Browse feed + Map…
Nov 11, 2025
a4affe8
Merge PR #89: Resolve conflict - keep correct photo flow (myDrafts)
Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.