wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5282 commits 4 branches 0 tags 17 MiB
Commit graph

808 commits

Author SHA1 Message Date
Michael Telatynski
ba3e204a48
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2021-03-01 22:25:45 +00:00
Richard van der Hoff
6badb3b6d8 Notes on OAuth2 and unknown idps 2021-03-01 19:19:41 +00:00
Richard van der Hoff
ba08c9fe36 notes on and alternatives 2021-01-27 16:48:32 +00:00
Richard van der Hoff
84346055e9
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-01-27 15:22:03 +00:00
Richard van der Hoff
09d41c59b9 add 'brand' 2021-01-27 13:00:12 +00:00
Richard van der Hoff
0c18f83636 grammar clarifications 2021-01-27 12:45:11 +00:00
Richard van der Hoff
277ff682d6 Formatting tweaks 2021-01-27 12:43:26 +00:00
Michael Telatynski
1d90cacf6e Merge branch 't3chguy/msc/multi-sso' of github.com:matrix-org/matrix-doc into t3chguy/msc/multi-sso 2021-01-19 13:53:10 +00:00
Michael Telatynski
85ccf93c6a Remove UIA stuff 2021-01-19 13:52:57 +00:00
Michael Telatynski
8be6540eaf
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-01-19 13:43:49 +00:00
Michael Telatynski
c7063a4eec Iterate PR based on feedback 2021-01-18 09:30:07 +00:00
Michael Telatynski
153c55788d Add more explanation 2020-11-26 10:47:05 +00:00
Michael Telatynski
8ac23599b2 Iterate MSC based on feedback 2020-11-19 09:36:34 +00:00
Michael Telatynski
f444273a42 be stricter on the icon url 2020-11-13 12:00:45 +00:00
Michael Telatynski
874e32d69d Merge remote-tracking branch 'origin/t3chguy/msc/multi-sso' into t3chguy/msc/multi-sso 2020-11-13 11:41:13 +00:00
Michael Telatynski
a391a4a05d Iterate the MSC 2020-11-13 11:41:06 +00:00
Michael Telatynski
20645365f4
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2020-11-12 12:50:37 +00:00
Michael Telatynski
a7eba773be Fix MSC number 2020-11-09 12:14:57 +00:00
Michael Telatynski
204732099b Multiple SSO Identity Providers 2020-11-09 12:11:07 +00: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
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
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