Commit graph

822 commits

Author SHA1 Message Date
Hubert Chathi
7678884376 clarifications to cross-signing MSC 2021-01-08 17:48:03 -05: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
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
Hubert Chathi
0b97ac59bf event IDs use $ 2020-11-18 22:52:06 -05: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
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
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
Travis Ralston
80214998f6 Various clarifications to structure 2020-08-21 08:34:35 -06:00
Travis Ralston
df74c7dbe3 Merge branch 'master' into travis/msc/integrations/openid 2020-08-21 08:14:28 -06:00
Travis Ralston
6490fda6ee
Apply suggestions from code review
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2020-08-21 07:07:41 -06:00
Richard van der Hoff
c00710d91a Revert "Merge pull request #1598 from matrix-org/rav/proposals/id_grammar"
This reverts commit d9135ef902, reversing
changes made to f714aaadd0.

People are getting confused by the fact this has been merged.
2020-08-19 15:12:54 +01:00
Travis Ralston
9080c5f87f
Revert "Revert "MSC2033: Adding a device_id to /account/whoami"" 2020-08-18 08:53:34 -06:00
Travis Ralston
ddc0d78e0c
Revert "MSC2033: Adding a device_id to /account/whoami" 2020-08-18 08:53:13 -06:00
Travis Ralston
0228cf8361
Merge pull request #2033 from matrix-org/travis/msc/whoami-device
MSC2033: Adding a device_id to /account/whoami
2020-08-18 08:47:00 -06:00
Travis Ralston
5c0f999503
Merge pull request #2689 from Awesome-Technologies/fix_guest_e2ee
MSC2689: Fix E2EE for guests
2020-07-29 08:18:35 -06:00
Travis Ralston
0973e88c7c
Merge pull request #2663 from matrix-org/rei/pushrules_define_enabled
MSC2663: Errors for dealing with non-existent push rules
2020-07-29 08:15:41 -06:00
Travis Ralston
a96a014512
Merge pull request #2610 from matrix-org/rav/proposal/remove-oauth2-auth-type
MSC2610: Remove `m.login.oauth2` User-Interactive Authentication type from the specification
2020-07-28 10:01:36 -06:00
Travis Ralston
5990d98525
Merge pull request #2611 from matrix-org/rav/proposal-remove-token-auth-type
MSC2611: Remove `m.login.token` User-Interactive Authentication type from the specification
2020-07-28 09:58:55 -06:00
Michael Albert
78f3c3dac8
Update proposals/2689-fix-e2ee-for-guests.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2020-07-24 21:47:45 +02:00
Olivier Wilkinson (reivilibre)
3dd5bc42a7 inexistent may or may not be a non-existent word
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2020-07-17 13:06:13 +01:00
Michael Albert
250f0e47c1 Fix typos 2020-07-15 22:06:19 +02:00
Michael Albert
adc867dc99 Fix E2EE for guests 2020-07-15 21:47:28 +02:00
Travis Ralston
e207dfc0ea
Merge pull request #2630 from uhoreg/sas2
MSC2630: checking public keys in SAS verification
2020-07-11 10:36:55 -06:00
Olivier Wilkinson (reivilibre)
90a37cdb30 Write MSC2663 2020-07-06 12:36:08 +01:00