OXYGENHUB

Changes up to # 70c3d02998a2 +3 touching crates/hub/tests/edits.rs · 25

See as swimlanes (independent work side by side)

70c3d02998a265776f5925971814ecb9f8bee7a225432ed181cedbf004a1de0c+a9088323c39024e0c4098547ac234cd71589e7a4af0c6b92fd6a343648e85ff2+b1860d6090ec974c444d35bae685fd50cdd7748e2cf00222d5c83dbb79c7c20d+b5668108487f12dd7f03ba9c52f7b95f82e8aab92c8c14f75cb949e7398a68c2 has 4 heads. The graph shows their union; heads are marked.
Resolve a proposal's conflicts on the web: the hub brings the target into the source bookmark, as oxy merge would, and opens the resolver; the proposal follows the resolution (closes #337)
Andy McCall via agent:claude@andymccall agent ·
◈ 217814c239f0
A proposal whose only conflicts are union adjacent insertions lands with their resolution (closes andymccall/oxygen#145)
Andy McCall via agent:claude@andymccall agent ·
◈ dd0788b756f2
Repository settings: one page per setting under a grouped sidebar (#278)
Andy McCall via agent:claude@andymccall agent ·
◈ c7067c7bda56
Trusted time on the hub: serve when witnesses first saw an entry cancel-landed-runs
Andy McCall via agent:claude@andymccall agent ·
◈ 13b27cb2200c
Readers never wait for a push or gc oh-comment-body-file
Andy McCall via agent:claude@andymccall agent ·
◈ 7c06f5b28ade
A new hub gives administrator only to whoever brings its setup code
Andy McCall via Claude Code agent ·
✔ c8684d44d549
UI polish: keys, backups, wiki, editor, bookmarks, summaries, backdrops v0.5.0
Andy McCall ·
✔ ffb67a81188c
Blame of a conflicted file no longer panics clear-waitingclose-proposal-140image-checkjob-waitsoh-comment-body-filerun-one-jobwiki-says-sov0.4.1v0.4.2v0.5.0v0.5.1v0.5.2
Andy McCall ·
✔ 8a2dbcb56246
A wiki can start with a push
Andy McCall ·
✔ 6e7dfa0a42b9
Agents get their marks; contributors one row each; an assistant is tested when added
Andy McCall ·
✔ 206c1fc1b06a
Wikis: Markdown pages as an Oxygen repository of their own
Andy McCall ·
✔ 66fd9d6b1452
Advanced settings: transfer, archive, delete, wiki placeholder
Andy McCall ·
✔ d0fbea2eb46e
Who did the work: via AGENT, rotated identities link themselves, a Flow badge
Andy McCall ·
✔ 8933faff2043
Pin oxygen main: scoped delegates; the hub needs changes and refs
Andy McCall ·
✔ b43a9ab0498f
VS Code links name oxygenhub.oxygen-vscode again cancel-landed-runsclear-waitingclose-proposal-140image-checkjob-waitsoh-comment-body-filerun-one-jobwiki-says-sov0.2.0v0.3.0v0.3.1v0.4.0v0.4.1v0.4.2v0.5.0v0.5.1v0.5.2
Andy McCall ·
✔ c96b32865000
VS Code links name oxygenhub.oxygen v0.1.0
Andy McCall ·
✔ 129c23effb73
VS Code links name oxygenhub.oxygen-vscode
Andy McCall ·
✔ d3e75fb41e61
Proposals from feature/ bookmarks; a landing says who and how v0.1.0
Andy McCall ·
✔ 0b20f1ec4007
Proposal page: centred timeline with avatars, inline editing, labels and projects
Andy McCall ·
✔ a1b9869565aa
Resolve conflicts together, live
Andy McCall ·
✔ 5e6d6484c28e
Resolve a binary file's conflicting versions by keeping one
Andy McCall ·
✔ 9e5ef6c23006
Resolve in VS Code; the name conflict test picks its candidate reliably
Andy McCall ·
✔ 16cb2b3aa947
Resolve name conflicts by keeping a candidate
Andy McCall ·
✔ fd958fbc06fb
Resolve conflicts region by region
Andy McCall ·
✔ c5f3bde466d1
Web edits and browser conflict resolution; landing under a policy
Andy McCall ·
✔ 145306044896