Richard van der Hoff
|
09d41c59b9
|
add 'brand'
|
4 years ago |
|
Richard van der Hoff
|
0c18f83636
|
grammar clarifications
|
4 years ago |
|
Richard van der Hoff
|
277ff682d6
|
Formatting tweaks
|
4 years ago |
|
Michael Telatynski
|
1d90cacf6e
|
Merge branch 't3chguy/msc/multi-sso' of github.com:matrix-org/matrix-doc into t3chguy/msc/multi-sso
|
4 years ago |
|
Michael Telatynski
|
85ccf93c6a
|
Remove UIA stuff
|
4 years ago |
|
Michael Telatynski
|
8be6540eaf
|
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
|
4 years ago |
|
Michael Telatynski
|
c7063a4eec
|
Iterate PR based on feedback
|
4 years ago |
|
Michael Telatynski
|
153c55788d
|
Add more explanation
|
4 years ago |
|
Michael Telatynski
|
8ac23599b2
|
Iterate MSC based on feedback
|
4 years ago |
|
Michael Telatynski
|
f444273a42
|
be stricter on the icon url
|
4 years ago |
|
Michael Telatynski
|
874e32d69d
|
Merge remote-tracking branch 'origin/t3chguy/msc/multi-sso' into t3chguy/msc/multi-sso
|
4 years ago |
|
Michael Telatynski
|
a391a4a05d
|
Iterate the MSC
|
4 years ago |
|
Michael Telatynski
|
20645365f4
|
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
|
4 years ago |
|
Michael Telatynski
|
a7eba773be
|
Fix MSC number
|
4 years ago |
|
Michael Telatynski
|
204732099b
|
Multiple SSO Identity Providers
|
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
|
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 |
|
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
|
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 |
|
Travis Ralston
|
80214998f6
|
Various clarifications to structure
|
4 years ago |
|
Travis Ralston
|
df74c7dbe3
|
Merge branch 'master' into travis/msc/integrations/openid
|
4 years ago |
|
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>
|
4 years ago |
|
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.
|
4 years ago |
|
Travis Ralston
|
9080c5f87f
|
Revert "Revert "MSC2033: Adding a device_id to /account/whoami""
|
4 years ago |
|
Travis Ralston
|
ddc0d78e0c
|
Revert "MSC2033: Adding a device_id to /account/whoami"
|
4 years ago |
|
Travis Ralston
|
0228cf8361
|
Merge pull request #2033 from matrix-org/travis/msc/whoami-device
MSC2033: Adding a device_id to /account/whoami
|
4 years ago |
|
Travis Ralston
|
5c0f999503
|
Merge pull request #2689 from Awesome-Technologies/fix_guest_e2ee
MSC2689: Fix E2EE for guests
|
4 years ago |
|
Travis Ralston
|
0973e88c7c
|
Merge pull request #2663 from matrix-org/rei/pushrules_define_enabled
MSC2663: Errors for dealing with non-existent push rules
|
4 years ago |
|
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
|
4 years ago |
|
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
|
4 years ago |
|
Michael Albert
|
78f3c3dac8
|
Update proposals/2689-fix-e2ee-for-guests.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
|
4 years ago |