Commit graph

5282 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
7ff9be4fee
Merge pull request #2857 from wbamberg/fix-capabilities-api-typo
Fix typo in Capabilities API title
2020-11-08 10:51:13 -07:00
Will
42bb5127be
Fix typo in API title 2020-11-08 09:44:11 -08: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
Hubert Chathi
8284e78d92
Merge pull request #2826 from matrix-org/uhoreg/keys_withheld
add spec for reporting that keys are withheld
2020-11-04 19:03:10 -05:00
Hubert Chathi
267eead50f apply changes from review 2020-11-02 12:30:57 -05: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
7b4ea94f22 add changelog 2020-10-19 19:12:01 -04:00
Hubert Chathi
38350002a6 add spec for reporting that keys are withheld 2020-10-19 18:57:39 -04:00
Travis Ralston
deaa82c653 Rebuild sas-emoji.json 2020-10-16 13:31:14 -06:00
Travis Ralston
651e73dfda Merge remote-tracking branch 'RiotTranslateBot/weblate-matrix-doc-sas-emoji-v1' 2020-10-16 13:30:46 -06:00
Weblate
e0a6024cd6 Merge branch 'origin/master' into Weblate. 2020-10-16 19:29:40 +00:00
Travis Ralston
a402da4edc
Merge pull request #2814 from aaronraimist/m.room.redaction
Clarify m.room.redaction, remove duplicate entry
2020-10-16 13:19:21 -06:00
random
39fbda7251 Translated using Weblate (Italian)
Currently translated at 100.0% (64 of 64 strings)

Translation: matrix-doc/SAS Emoji v1
Translate-URL: https://translate.element.io/projects/matrix-doc/sas-emoji-v1/it/
2020-10-16 09:04:33 +00:00
random
404158fe39 Added translation using Weblate (Italian) 2020-10-15 08:20:52 +00:00
Aaron Raimist
a82b657a0a
Attempt to differentiate between m.room.redaction event PL and redact PL
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-14 22:44:17 -05:00
Travis Ralston
48d4e95dd3
Merge pull request #2817 from aaronraimist/room-v1
Improve wording of room version 1 warnings
2020-10-14 16:24:10 -06:00
Travis Ralston
5ce774629b
Update specification/rooms/v1.rst 2020-10-14 16:23:57 -06:00
Aaron Raimist
bc085fd75d
Remove extra space
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-13 11:44:08 -05:00
Aaron Raimist
15805761be
Describe what a state reset is
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-13 11:42:24 -05:00
Aaron Raimist
8005467628
Put back first warning, reword "most popular"
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-13 11:42:03 -05:00
Aaron Raimist
4414d44f34
Remove duplicate description of who can redact a message and correct that description
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-12 22:30:52 -05:00
Aaron Raimist
954099efc6
Improve wording of room version 1 warnings
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-10 14:29:02 -05:00
Aaron Raimist
206b4dfb29
Add changelog
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-10 13:11:00 -05:00
Aaron Raimist
445b0a3a01
Clarify m.room.redaction, remove duplicate entry
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-10 12:59:47 -05:00
Matthew Hodgson
62cfc8c472 m.message->m.room.message; fixes #2761 2020-10-10 15:08:29 +01:00
Travis Ralston
d323738db5 Add changelog for 2809 2020-10-08 09:15:49 -06:00
Travis Ralston
9a1badee45 Merge remote-tracking branch 'jcgruenhage/patch-1' 2020-10-08 09:15:11 -06:00
Travis Ralston
2887c715bb
Merge pull request #2795 from matrix-org/travis/spec/msc2367-reason
Add membership reasons to the spec for all membership events
2020-10-07 14:51:53 -06:00
Travis Ralston
9ea7b2f5df
Merge pull request #2796 from matrix-org/travis/spec/msc2663-push-errors
Add 404 error responses to push rule endpoints
2020-10-07 14:51:29 -06:00