Code

MSC2241: Key verification in DMs#2241

Code

Merged

turt2live merged 19 commits intomatrix-org:mastermatrix-org/matrix-spec-proposals:masterfrom uhoreg:e2e_verification_in_dmsuhoreg/matrix-doc:e2e_verification_in_dmsCopy head branch name to clipboardApr 18, 2021

+314

Commits

Commits on Aug 22, 2019

• initial draft of verification in DMs

  uhoreg

  committed
  4f65524

• rename to match PR number

  uhoreg

  committed
  fb724bc

Commits on Aug 24, 2019

• write more stuff

  uhoreg

  committed
  0e6286f

Commits on Sep 5, 2019

• remove empty tradeoffs section

  uhoreg

  committed
  0007498

Commits on Sep 25, 2019

• make some fixes, add a clarification, add a message to indicate completion

  uhoreg

  committed
  e19fca7

Commits on Oct 8, 2019

• add from_device fields and a FIXME

  uhoreg

  committed
  7469198

• drop the recommendation that requests highlight the user

  uhoreg

  committed
  ab3ed73

• fix a couple of missed m.reference changes

  uhoreg

  committed
  1f1d22f

Commits on Oct 23, 2019

• Apply suggestions from code review

  Show description for 06ee66d
  

  3 peopleauthored
  06ee66d

• add clarifications

  uhoreg

  committed
  1d165ee

• Merge branch 'e2e_verification_in_dms' of github.com:uhoreg/matrix-doc into e2e_verification_in_dms

  uhoreg

  committed
  788e987

Commits on Nov 1, 2019

• add note that verifying yourself may want to use to_device instead

  uhoreg

  committed
  7466955

Commits on Nov 5, 2019

• add notes about redactions/edits

  uhoreg

  committed
  f4bad37

• add note about displaying other events

  uhoreg

  committed
  a514485

Commits on Nov 18, 2019

• make hash commitment always include the m.relates_to

  uhoreg

  committed
  1590ae2

Commits on Apr 15, 2020

• use .ready to accept a verification, plus some clarification

  uhoreg

  committed
  91f51bb

Commits on Dec 6, 2020

• Update proposals/2241-e2e-verification-in-dms.md

  Show description for 4a77978
  

  uhoreg

  and

  poljar

  authored
  4a77978

Commits on Dec 14, 2020

• use reason for human-readable cancel reason

  Show description for affa240
  uhoreg

  committed
  affa240

Commits on Apr 13, 2021

• decouple from MSC1849/MSC2674

  uhoreg

  committed
  6096416