Commit Graph

5310 Commits (6ccc5489126c9e19ed471a0a209f1885e0edd1d4)
 

Author SHA1 Message Date
Travis Ralston 6ccc548912 Revert "Merge branch 'travis/msc/1337-joined-rooms'"
This reverts commit 0961c7b0f7.
4 years ago
Travis Ralston e659572183 Add changelogs for 2888 4 years ago
Travis Ralston 0961c7b0f7 Merge branch 'travis/msc/1337-joined-rooms' 4 years ago
Travis Ralston 942e8b36e4 Convert to markdown verbatim 4 years ago
Travis Ralston 8d4d6a12e8 Add missing changelog 4 years ago
Travis Ralston b0a33e97b1
Merge pull request #2885 from naosia/patch-1
Fix typo in moderation_policies.rst
4 years ago
Emelie b1d403083c
Fix typo in moderation_policies.rst
deliberatly -> deliberately
4 years ago
Travis Ralston f3c625ee3a
Merge pull request #2878 from deepbluev7/fix-extensible-events-link
Update link to extensible events MSC
4 years ago
Nicolas Werner a0f4ae6b38 Add newsfragment
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
4 years ago
Nicolas Werner 0fd1654879 Update link to extensible events MSC
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
4 years ago
Travis Ralston bce1bf3210
Merge pull request #1544 from uhoreg/qr_key_verification
MSC1544: Key verification using QR codes
4 years ago
Hubert Chathi 9db8cc98d9
Update proposals/1543-qr_code_key_verification.md
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
4 years ago
Hubert Chathi 0b97ac59bf event IDs use $ 4 years ago
Travis Ralston 940bb49027
Merge pull request #2774 from matrix-org/travis/msc/widget-id
MSC2774: Expose the widget ID to the widget
4 years ago
Travis Ralston c6441176b8 Update i18n 4 years ago
Travis Ralston 83fd17f30c Merge remote-tracking branch 'RiotTranslateBot/weblate-matrix-doc-sas-emoji-v1' 4 years ago
Weblate 8300ec5659 Merge branch 'origin/master' into Weblate. 4 years ago
Travis Ralston 7ff9be4fee
Merge pull request #2857 from wbamberg/fix-capabilities-api-typo
Fix typo in Capabilities API title
4 years ago
Will 42bb5127be
Fix typo in API title 4 years ago
Travis Ralston c4d01b90e9
Merge pull request #2765 from matrix-org/travis/msc/widget-avatars
MSC2765: Widget avatars
4 years ago
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/
4 years ago
Auri Botines Puertas 30448b988c Added translation using Weblate (Catalan) 4 years ago
Hubert Chathi 8284e78d92
Merge pull request #2826 from matrix-org/uhoreg/keys_withheld
add spec for reporting that keys are withheld
4 years ago
Hubert Chathi 267eead50f apply changes from review 4 years ago
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/
4 years ago
Nikolai Zahariev 3fed0dd17f Added translation using Weblate (Bulgarian) 4 years ago
Travis Ralston 4ee990e26f
Merge pull request #2758 from matrix-org/rav/proposals/textual_identifier_grammar
MSC2758: Proposal for a common identifier grammar
4 years ago
Travis Ralston ee55d9d35b
Update proposals/2765-widget-avatars.md
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
4 years ago
Richard van der Hoff 49ce93f3e2
Update 2758-textual-id-grammar.md 4 years ago
Hubert Chathi 7b4ea94f22 add changelog 4 years ago
Hubert Chathi 38350002a6 add spec for reporting that keys are withheld 4 years ago
Hubert Chathi 7b3c98cd98 we're using the binary format 4 years ago
Travis Ralston deaa82c653 Rebuild sas-emoji.json 4 years ago
Travis Ralston 651e73dfda Merge remote-tracking branch 'RiotTranslateBot/weblate-matrix-doc-sas-emoji-v1' 4 years ago
Weblate e0a6024cd6 Merge branch 'origin/master' into Weblate. 4 years ago
Travis Ralston a402da4edc
Merge pull request #2814 from aaronraimist/m.room.redaction
Clarify m.room.redaction, remove duplicate entry
4 years ago
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/
4 years ago
random 404158fe39 Added translation using Weblate (Italian) 4 years ago
Aaron Raimist a82b657a0a
Attempt to differentiate between m.room.redaction event PL and redact PL
Signed-off-by: Aaron Raimist <aaron@raim.ist>
4 years ago
Travis Ralston 48d4e95dd3
Merge pull request #2817 from aaronraimist/room-v1
Improve wording of room version 1 warnings
4 years ago
Travis Ralston 5ce774629b
Update specification/rooms/v1.rst 4 years ago
Aaron Raimist bc085fd75d
Remove extra space
Signed-off-by: Aaron Raimist <aaron@raim.ist>
4 years ago
Aaron Raimist 15805761be
Describe what a state reset is
Signed-off-by: Aaron Raimist <aaron@raim.ist>
4 years ago
Aaron Raimist 8005467628
Put back first warning, reword "most popular"
Signed-off-by: Aaron Raimist <aaron@raim.ist>
4 years ago
Aaron Raimist 4414d44f34
Remove duplicate description of who can redact a message and correct that description
Signed-off-by: Aaron Raimist <aaron@raim.ist>
4 years ago
Aaron Raimist 954099efc6
Improve wording of room version 1 warnings
Signed-off-by: Aaron Raimist <aaron@raim.ist>
4 years ago
Aaron Raimist 206b4dfb29
Add changelog
Signed-off-by: Aaron Raimist <aaron@raim.ist>
4 years ago
Aaron Raimist 445b0a3a01
Clarify m.room.redaction, remove duplicate entry
Signed-off-by: Aaron Raimist <aaron@raim.ist>
4 years ago
Matthew Hodgson 62cfc8c472 m.message->m.room.message; fixes #2761 4 years ago
Travis Ralston 411202f2bf
spelling
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
4 years ago