Commit Graph

5698 Commits (f9dce3dfedb739d1437907620aa55e727131a734)
 

Author SHA1 Message Date
Hubert Chathi c56c6a2e2b
Update api/client-server/cross_signing.yaml
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
4 years ago
Travis Ralston b07618cc3f Make clarifications to the spec 4 years ago
Travis Ralston 8d6642aaa7 Merge branch 'master' into travis/msc/global-versioning 4 years ago
Hubert Chathi affa240543 use `reason` for human-readable cancel reason
for consistency with non-DM version
4 years ago
Travis Ralston ba6a72f65f Merge remote-tracking branch 'p-e-w/spelling-grammar' 4 years ago
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
Hubert Chathi 4a779784ef
Update proposals/2241-e2e-verification-in-dms.md
Co-authored-by: poljar <poljar@termina.org.uk>
4 years ago
Travis Ralston 734be5165b
Apply suggestions from code review
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
4 years ago
Travis Ralston 942e8b36e4 Convert to markdown verbatim 4 years ago
Philipp Emanuel Weidmann aab2d587f3
Fix spelling and grammar issues
Signed-off-by: Philipp Emanuel Weidmann <pew@worldwidemann.com>
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
Andrew Morgan 7dcff8f2e1 Disallow invite->knock membership changes 4 years ago
Michael Telatynski 153c55788d Add more explanation 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 11d6e42ee1 use MSC number 4 years ago
Hubert Chathi f7a397dc90 add proposal for Single SSSS 4 years ago
Travis Ralston 11daaf6ea9 Add a small note about widgets 4 years ago
Travis Ralston 8cc3d44c2a Generally wording changes; Change deprecation 4 years ago
Travis Ralston 09c569f1a7 Cover a case of no-op versions 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
Andrew Morgan 6c75b83b99 Address Travis and Patrick's feedback 4 years ago
Travis Ralston 74746634af
Apply suggestions from code review
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
4 years ago
Michael Telatynski 8ac23599b2 Iterate MSC based on feedback 4 years ago
Hubert Chathi 0b97ac59bf event IDs use $ 4 years ago
Michael Telatynski f444273a42 be stricter on the icon url 4 years ago
Michael Telatynski 874e32d69d Merge remote-tracking branch 'origin/t3chguy/msc/multi-sso' into t3chguy/msc/multi-sso 4 years ago
Michael Telatynski a391a4a05d Iterate the MSC 4 years ago
Travis Ralston d079d7d2d3 Answer question about confusing deprecation with not 4 years ago
Travis Ralston 1310c7c8bf Finish up the last few sections 4 years ago
Michael Telatynski 20645365f4
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
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 4dee8dbeab Versioning WIP 4 years ago
Travis Ralston 973ee1438c Progress checkpoint on room versions 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
Michael Telatynski a7eba773be Fix MSC number 4 years ago
Michael Telatynski 204732099b Multiple SSO Identity Providers 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