Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-31 04:58:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
6311 commits 31 branches 42 tags 32 MiB
Commit graph

6311 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Richard van der Hoff fbad757ceb update dependencies links 2020-11-11 17:52:16 +00:00
Richard van der Hoff e6a6941845 rename allowed_join again 2020-11-11 16:50:21 +00:00
Richard van der Hoff 3b2825f21d Descope autokick and rename allowed_spaces 2020-11-11 16:38:19 +00:00
Richard van der Hoff 4e3b0ed05f add a length limit to order 2020-11-11 16:03:32 +00:00
Richard van der Hoff b40f7da8d2 Record alternatives 
make sure we have records of dismissed alternatives
 2020-11-11 15:56:52 +00:00
Richard van der Hoff ae71a6219a Restricting room membership via spaces 2020-11-11 12:13:42 +00: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
Richard van der Hoff 29b07c11ad update power level mappings 2020-11-10 12:56:16 +00:00
Richard van der Hoff 06b5c8342f notes on children and recursion 2020-11-10 12:08:29 +00:00
Richard van der Hoff 109c31c2c8 Avoiding abuse via false parent claims 2020-11-10 11:45:37 +00:00
Travis Ralston c6441176b8 Update i18n 2020-11-09 15:12:49 -07:00
Travis Ralston 83fd17f30c Merge remote-tracking branch 'RiotTranslateBot/weblate-matrix-doc-sas-emoji-v1' 2020-11-09 15:12:14 -07:00
Weblate 8300ec5659 Merge branch 'origin/master' into Weblate. 2020-11-09 22:11:08 +00:00
Richard van der Hoff 839ea0e946 inheriting join rules 2020-11-09 15:11:59 +00:00
Richard van der Hoff a73dd9c371 clarification 2020-11-09 15:11:48 +00:00
Richard van der Hoff e323ade5f7 Switch to room IDs 2020-11-09 15:11:16 +00:00
Richard van der Hoff 1aede33b35 clarify introduction 2020-11-09 12:30:02 +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
Richard van der Hoff d42da585e5
Apply suggestions from code review 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2020-11-09 12:09:48 +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
Auri B. P 4a1d49ae4a Translated using Weblate (Catalan) 
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/ca/
 2020-11-06 01:49:54 +00:00
Auri Botines Puertas 30448b988c Added translation using Weblate (Catalan) 2020-11-05 01:34:04 +00: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
Nikolai Zahariev a5e3652d26 Translated using Weblate (Bulgarian) 
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/bg/
 2020-10-30 22:49:52 +00:00
Travis Ralston 5f8b7167a5 What if we versioned the whole spec? 2020-10-30 13:57:23 -06:00
Richard van der Hoff 11bb604c5e add an xxx 2020-10-30 18:47:37 +00:00
Richard van der Hoff 2f557daac1 Clarifications to room/space relationship 2020-10-30 18:46:05 +00:00
Richard van der Hoff e746aa3aad
Apply suggestions from code review 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2020-10-30 11:16:32 +00:00
Nikolai Zahariev 3fed0dd17f Added translation using Weblate (Bulgarian) 2020-10-29 21:50:03 +00:00
Richard van der Hoff 15f34e5be9 supporting trad PLs 2020-10-29 13:07:21 +00:00
Richard van der Hoff 5db56391f3
spelling 2020-10-29 12:21:46 +00:00
Richard van der Hoff c145d398f7 Notes on propagating PLs etc 2020-10-29 11:23:48 +00:00
Richard van der Hoff 52853b57e1 more updates 2020-10-27 18:41:45 +00:00
Richard van der Hoff 4040254001 Update for new terminology and current thinking 2020-10-27 18:15:20 +00: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
Richard van der Hoff 0baf49abe8 We are not considering hidden-membership rooms yet 2020-10-20 12:12:28 +01:00