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

5742 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Will dbf74ea85c
Add changelog entry 2020-10-07 10:41:31 -07:00
Will 1fe9cab30b
Allow guests to get the members for a room (MSC2689) 2020-10-07 10:38:23 -07:00
Travis Ralston e865f59c65
Merge pull request #2807 from wbamberg/msc2414-reporting-content-parameters 
Make score and reason optional in content reporting API (MSC2414)
 2020-10-07 10:47:47 -06:00
Will 89d53fd688
Add changelog entry 2020-10-07 09:42:46 -07:00
Will 6c9b25a397
Make score and reason parameters optional in content reporting API (MSC2414) 2020-10-07 09:38:03 -07: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
Travis Ralston ea5c8ba649
Merge pull request #2806 from wbamberg/remove-toc-bullets 
Suppress bullets inside table of contents
 2020-10-06 16:06:32 -06:00
Will deef4f5e7c
Suppress bullets inside table of contents 2020-10-06 14:03:37 -07:00
Travis Ralston e20121cbab
Merge pull request #2803 from matrix-org/travis/spec/v6 
Update the default recommended room version to v6
 2020-10-05 15:47:47 -06:00
Travis Ralston 56e0ee700a Update the default recommended room version to v6 
No changelog required - this is the index

MSC: https://github.com/matrix-org/matrix-doc/pull/2788
 2020-10-05 15:17:08 -06:00
Andrew Morgan a924f5b3d5 Fix incorrect assumptions about the sender field of a knock event 
Got a bit confused with the sender and state_key being different in invite
membership events. In case of a knock, even if the knock event is being
inserted into the room by another homeserver over federation, the sender
of the event is still the knocking user, just like the state_key.
 2020-10-05 20:24:56 +01:00
Andrew Morgan 525d1d33e0 Some clarifications and wording fixes 2020-10-05 17:09:33 +01:00
Travis Ralston 82a4a028bd
Merge pull request #2788 from matrix-org/travis/msc/v6-default 
MSC2788: Room version 6 as the default room version
 2020-10-04 21:13:36 -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
Richard van der Hoff 12da19f927 Words on e2ee events 2020-10-02 09:26:59 +01:00
Richard van der Hoff 46440b0e75 On why you should never trust an event. 2020-10-01 23:33:17 +01:00
Andrew Morgan 6f7bcb6052 Explicitly state what changes to the auth rules are necessary 2020-10-01 18:49:41 +01:00