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

6229 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Richard van der Hoff 6464e90fd6 Merge branch 'master' into matthew/msc1772 2020-10-20 12:02:44 +01:00
Richard van der Hoff 96cd76c868 remove 'one big event' proposal 2020-10-20 12:00:53 +01:00
Richard van der Hoff 417501d8cc various minor edits 2020-10-20 12:00:43 +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
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 411202f2bf
spelling 
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2020-10-09 10:16:01 -06:00
Andrew Morgan 815dae6eae Note that redactions of knocks are not a concern 2020-10-08 18:04:32 +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
Hubert Chathi cb44b6ea7b
Merge pull request #2808 from wbamberg/msc2689-guest-allow-members 
Allow guests to get the members for a room (MSC2689)
 2020-10-07 15:29:56 -04:00
Jan Christian Grünhage 9e29f59bdb
fix content type in upload example 2020-10-07 21:22:59 +02:00