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

5636 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andrew Morgan 6c75b83b99 Address Travis and Patrick's feedback 2020-11-20 16:45:45 +00:00
Travis Ralston 74746634af
Apply suggestions from code review 
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2020-11-19 08:18:45 -07:00
Michael Telatynski 8ac23599b2 Iterate MSC based on feedback 2020-11-19 09:36:34 +00:00
Hubert Chathi 0b97ac59bf event IDs use $ 2020-11-18 22:52:06 -05: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
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
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
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
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
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
Nikolai Zahariev 3fed0dd17f Added translation using Weblate (Bulgarian) 2020-10-29 21:50:03 +00:00
Richard van der Hoff 5db56391f3
spelling 2020-10-29 12:21:46 +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
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
Hubert Chathi 7b3c98cd98 we're using the binary format 2020-10-16 22:43:04 -04:00
Hubert Chathi a5ebedc131 apply suggestions from review 2020-10-16 18:36:02 -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