Commit Graph

848 Commits (e88a18ca5dafd7b0b70538086074724e1913c4cb)

Author SHA1 Message Date
Travis Ralston 315cf67f6b
Merge pull request #2366 from uhoreg/key_verification_accept
MSC2366: Key verification flow additions: m.key.verification.ready and m.key.verification.done
3 years ago
Travis Ralston 5800dcb654
Merge pull request #2844 from matrix-org/travis/msc/global-versioning
MSC2844: Global version number for the whole spec
3 years ago
Travis Ralston 46d843e8fa Make deprecation industry standard 4 years ago
Travis Ralston 124c8d43d3
Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
4 years ago
Travis Ralston 22acbea0ed
Apply suggestions from code review
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
4 years ago
Travis Ralston 7b4e702a69 Remove patch versions, policy stuff, etc 4 years ago
Hubert Chathi 7678884376 clarifications to cross-signing MSC 4 years ago
Travis Ralston b07618cc3f Make clarifications to the spec 4 years ago
Travis Ralston 8d6642aaa7 Merge branch 'master' into travis/msc/global-versioning 4 years ago
Travis Ralston 6ccc548912 Revert "Merge branch 'travis/msc/1337-joined-rooms'"
This reverts commit 0961c7b0f7.
4 years ago
Travis Ralston 942e8b36e4 Convert to markdown verbatim 4 years ago
Travis Ralston bce1bf3210
Merge pull request #1544 from uhoreg/qr_key_verification
MSC1544: Key verification using QR codes
4 years ago
Travis Ralston 11daaf6ea9 Add a small note about widgets 4 years ago
Travis Ralston 8cc3d44c2a Generally wording changes; Change deprecation 4 years ago
Travis Ralston 09c569f1a7 Cover a case of no-op versions 4 years ago
Hubert Chathi 9db8cc98d9
Update proposals/1543-qr_code_key_verification.md
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
4 years ago
Travis Ralston 74746634af
Apply suggestions from code review
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
4 years ago
Hubert Chathi 0b97ac59bf event IDs use $ 4 years ago
Travis Ralston d079d7d2d3 Answer question about confusing deprecation with not 4 years ago
Travis Ralston 1310c7c8bf Finish up the last few sections 4 years ago
Travis Ralston 940bb49027
Merge pull request #2774 from matrix-org/travis/msc/widget-id
MSC2774: Expose the widget ID to the widget
4 years ago
Travis Ralston 4dee8dbeab Versioning WIP 4 years ago
Travis Ralston 973ee1438c Progress checkpoint on room versions 4 years ago
Travis Ralston c4d01b90e9
Merge pull request #2765 from matrix-org/travis/msc/widget-avatars
MSC2765: Widget avatars
4 years ago
Travis Ralston 5f8b7167a5 What if we versioned the whole spec? 4 years ago
Travis Ralston 4ee990e26f
Merge pull request #2758 from matrix-org/rav/proposals/textual_identifier_grammar
MSC2758: Proposal for a common identifier grammar
4 years ago
Travis Ralston ee55d9d35b
Update proposals/2765-widget-avatars.md
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
4 years ago
Richard van der Hoff 49ce93f3e2
Update 2758-textual-id-grammar.md 4 years ago
Hubert Chathi 7b3c98cd98 we're using the binary format 4 years ago
Travis Ralston 411202f2bf
spelling
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
4 years ago
Travis Ralston 9e66d32225
Merge pull request #2414 from iinuwa/master
MSC2414: Make reason and score parameters optional for reporting content
4 years ago
iinuwa 02512f0f69
Use endpoint instead of API
Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com>
4 years ago
Travis Ralston 51b278e015 Mention the endpoint 4 years ago
iinuwa 07dbdab898
Fix typos 4 years ago
iinuwa 9be28c5ade
Add proposal to remove score; reorganize 4 years ago
Travis Ralston 2ccdcead9c Fix number 4 years ago
Travis Ralston 9f06c0a2e2 What if we make v6 as the default? 4 years ago
Travis Ralston 561043663f
Merge pull request #1960 from matrix-org/travis/msc/integrations/openid
MSC1960: OpenID information exchange with widgets
4 years ago
Travis Ralston b3116e4a3c Proposal to have widgets aware of their widget ID 4 years ago
Travis Ralston c9e8326783 Reword following widget spec 4 years ago
Travis Ralston 70e69a110a Move the avatar up a level 4 years ago
Travis Ralston d8bc158a3b Renumber 4 years ago
Travis Ralston 1f734cd4a9 Proposal to support widget avatars 4 years ago
Richard van der Hoff 998dec2980
Update proposals/2758-textual-id-grammar.md 4 years ago
Richard van der Hoff 49e4e61e80
fix typos
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
4 years ago
Richard van der Hoff b3f40fb553 fix a couple of typos 4 years ago
Richard van der Hoff 1688f12d08 Proposal for a common identifier grammar 4 years ago
Travis Ralston e304109289 fix widget example 4 years ago
Travis Ralston 4cb7e96b11
Apply suggestions from code review
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
4 years ago
Travis Ralston 3943e63ae2
Merge pull request #2738 from matrix-org/revert-2737-revert-2033-travis/msc/whoami-device
TBD: MSC2033: Adding a device_id to /account/whoami
4 years ago