Commit graph

848 commits

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
2021-01-31 10:06:36 -07:00
Travis Ralston
5800dcb654
Merge pull request #2844 from matrix-org/travis/msc/global-versioning
MSC2844: Global version number for the whole spec
2021-01-17 12:58:42 -07:00
Travis Ralston
46d843e8fa Make deprecation industry standard 2021-01-12 09:52:50 -07:00
Travis Ralston
124c8d43d3
Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2021-01-12 09:22:06 -07:00
Travis Ralston
22acbea0ed
Apply suggestions from code review
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
2021-01-09 20:38:58 -07:00
Travis Ralston
7b4e702a69 Remove patch versions, policy stuff, etc 2021-01-09 20:33:20 -07:00
Hubert Chathi
7678884376 clarifications to cross-signing MSC 2021-01-08 17:48:03 -05:00
Travis Ralston
b07618cc3f Make clarifications to the spec 2020-12-15 09:49:27 -07:00
Travis Ralston
8d6642aaa7 Merge branch 'master' into travis/msc/global-versioning 2020-12-15 09:34:59 -07:00
Travis Ralston
6ccc548912 Revert "Merge branch 'travis/msc/1337-joined-rooms'"
This reverts commit 0961c7b0f7.
2020-12-07 14:34:10 -07:00
Travis Ralston
942e8b36e4 Convert to markdown verbatim 2020-12-04 10:38:14 -07:00
Travis Ralston
bce1bf3210
Merge pull request #1544 from uhoreg/qr_key_verification
MSC1544: Key verification using QR codes
2020-11-25 13:26:28 -07:00
Travis Ralston
11daaf6ea9 Add a small note about widgets 2020-11-22 18:58:36 -07:00
Travis Ralston
8cc3d44c2a Generally wording changes; Change deprecation 2020-11-22 01:22:05 -07:00
Travis Ralston
09c569f1a7 Cover a case of no-op versions 2020-11-22 01:03:54 -07:00
Hubert Chathi
9db8cc98d9
Update proposals/1543-qr_code_key_verification.md
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2020-11-20 22:52:41 -05:00
Travis Ralston
74746634af
Apply suggestions from code review
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2020-11-19 08:18:45 -07:00
Hubert Chathi
0b97ac59bf event IDs use $ 2020-11-18 22:52:06 -05:00
Travis Ralston
d079d7d2d3 Answer question about confusing deprecation with not 2020-11-12 17:51:22 -07:00
Travis Ralston
1310c7c8bf Finish up the last few sections 2020-11-12 17:45:26 -07:00
Travis Ralston
940bb49027
Merge pull request #2774 from matrix-org/travis/msc/widget-id
MSC2774: Expose the widget ID to the widget
2020-11-11 12:52:50 -07:00
Travis Ralston
4dee8dbeab Versioning WIP 2020-11-10 16:31:53 -07:00
Travis Ralston
973ee1438c Progress checkpoint on room versions 2020-11-10 12:51:50 -07:00
Travis Ralston
c4d01b90e9
Merge pull request #2765 from matrix-org/travis/msc/widget-avatars
MSC2765: Widget avatars
2020-11-07 10:52:38 -07:00
Travis Ralston
5f8b7167a5 What if we versioned the whole spec? 2020-10-30 13:57:23 -06:00
Travis Ralston
4ee990e26f
Merge pull request #2758 from matrix-org/rav/proposals/textual_identifier_grammar
MSC2758: Proposal for a common identifier grammar
2020-10-25 13:09:57 -06:00
Travis Ralston
ee55d9d35b
Update proposals/2765-widget-avatars.md
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
2020-10-22 11:23:32 -06:00
Richard van der Hoff
49ce93f3e2
Update 2758-textual-id-grammar.md 2020-10-20 14:41:37 +01:00
Hubert Chathi
7b3c98cd98 we're using the binary format 2020-10-16 22:43:04 -04:00
Travis Ralston
411202f2bf
spelling
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2020-10-09 10:16:01 -06:00
Travis Ralston
9e66d32225
Merge pull request #2414 from iinuwa/master
MSC2414: Make reason and score parameters optional for reporting content
2020-10-07 08:08:48 -06:00
iinuwa
02512f0f69
Use endpoint instead of API
Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com>
2020-10-02 09:12:18 -05:00
Travis Ralston
51b278e015 Mention the endpoint 2020-10-02 07:42:35 -06:00
iinuwa
07dbdab898
Fix typos 2020-09-23 16:37:26 -05:00
iinuwa
9be28c5ade
Add proposal to remove score; reorganize 2020-09-23 16:34:46 -05:00
Travis Ralston
2ccdcead9c Fix number 2020-09-23 07:48:28 -06:00
Travis Ralston
9f06c0a2e2 What if we make v6 as the default? 2020-09-23 07:46:38 -06:00
Travis Ralston
561043663f
Merge pull request #1960 from matrix-org/travis/msc/integrations/openid
MSC1960: OpenID information exchange with widgets
2020-09-20 11:46:35 -06:00
Travis Ralston
b3116e4a3c Proposal to have widgets aware of their widget ID 2020-09-11 13:36:46 -06:00
Travis Ralston
c9e8326783 Reword following widget spec 2020-09-05 14:56:34 -06:00
Travis Ralston
70e69a110a Move the avatar up a level 2020-09-03 09:00:36 -06:00
Travis Ralston
d8bc158a3b Renumber 2020-09-03 08:55:27 -06:00
Travis Ralston
1f734cd4a9 Proposal to support widget avatars 2020-09-03 08:53:10 -06:00
Richard van der Hoff
998dec2980
Update proposals/2758-textual-id-grammar.md 2020-09-02 17:50:15 +01:00
Richard van der Hoff
49e4e61e80
fix typos
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
2020-09-01 22:34:31 +01:00
Richard van der Hoff
b3f40fb553 fix a couple of typos 2020-09-01 18:23:46 +01:00
Richard van der Hoff
1688f12d08 Proposal for a common identifier grammar 2020-09-01 18:19:56 +01:00
Travis Ralston
e304109289 fix widget example 2020-08-27 08:21:41 -06:00
Travis Ralston
4cb7e96b11
Apply suggestions from code review
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2020-08-27 08:13:12 -06:00
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
2020-08-23 08:51:31 -06:00