Andrew Morgan
|
0a53c86397
|
Make 'messages' a required JSON body field in /sendToDevice
|
2020-12-29 16:25:28 +00:00 |
|
Hubert Chathi
|
f352de90c3
|
Merge pull request #2536 from uhoreg/cross-signing-spec
initial spec for cross-signing
|
2020-12-15 13:11:16 -05:00 |
|
Hubert Chathi
|
c56c6a2e2b
|
Update api/client-server/cross_signing.yaml
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
|
2020-12-15 12:35:02 -05:00 |
|
Travis Ralston
|
b07618cc3f
|
Make clarifications to the spec
|
2020-12-15 09:49:27 -07:00 |
|
Travis Ralston
|
8d6642aaa7
|
Merge branch 'master' into travis/msc/global-versioning
|
2020-12-15 09:34:59 -07:00 |
|
Hubert Chathi
|
affa240543
|
use reason for human-readable cancel reason
for consistency with non-DM version
|
2020-12-14 11:35:12 -05:00 |
|
Travis Ralston
|
ba6a72f65f
|
Merge remote-tracking branch 'p-e-w/spelling-grammar'
|
2020-12-07 14:34:19 -07:00 |
|
Travis Ralston
|
6ccc548912
|
Revert "Merge branch 'travis/msc/1337-joined-rooms'"
This reverts commit 0961c7b0f7.
|
2020-12-07 14:34:10 -07:00 |
|
Travis Ralston
|
e659572183
|
Add changelogs for 2888
|
2020-12-07 14:32:58 -07:00 |
|
Travis Ralston
|
0961c7b0f7
|
Merge branch 'travis/msc/1337-joined-rooms'
|
2020-12-07 14:31:26 -07:00 |
|
Hubert Chathi
|
4a779784ef
|
Update proposals/2241-e2e-verification-in-dms.md
Co-authored-by: poljar <poljar@termina.org.uk>
|
2020-12-06 09:43:53 -05:00 |
|
Travis Ralston
|
734be5165b
|
Apply suggestions from code review
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
|
2020-12-04 14:46:11 -07:00 |
|
Travis Ralston
|
942e8b36e4
|
Convert to markdown verbatim
|
2020-12-04 10:38:14 -07:00 |
|
Philipp Emanuel Weidmann
|
aab2d587f3
|
Fix spelling and grammar issues
Signed-off-by: Philipp Emanuel Weidmann <pew@worldwidemann.com>
|
2020-12-04 11:32:55 +05:30 |
|
Travis Ralston
|
8d4d6a12e8
|
Add missing changelog
|
2020-11-30 13:40:46 -07:00 |
|
Travis Ralston
|
b0a33e97b1
|
Merge pull request #2885 from naosia/patch-1
Fix typo in moderation_policies.rst
|
2020-11-30 13:40:15 -07:00 |
|
Emelie
|
b1d403083c
|
Fix typo in moderation_policies.rst
deliberatly -> deliberately
|
2020-11-29 21:50:33 +01:00 |
|
Andrew Morgan
|
7dcff8f2e1
|
Disallow invite->knock membership changes
|
2020-11-27 11:04:21 +00:00 |
|
Michael Telatynski
|
153c55788d
|
Add more explanation
|
2020-11-26 10:47:05 +00:00 |
|
Travis Ralston
|
f3c625ee3a
|
Merge pull request #2878 from deepbluev7/fix-extensible-events-link
Update link to extensible events MSC
|
2020-11-25 13:32:59 -07:00 |
|
Nicolas Werner
|
a0f4ae6b38
|
Add newsfragment
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
|
2020-11-25 22:29:30 +01:00 |
|
Nicolas Werner
|
0fd1654879
|
Update link to extensible events MSC
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
|
2020-11-25 21:51:58 +01:00 |
|
Travis Ralston
|
bce1bf3210
|
Merge pull request #1544 from uhoreg/qr_key_verification
MSC1544: Key verification using QR codes
|
2020-11-25 13:26:28 -07:00 |
|
Hubert Chathi
|
11d6e42ee1
|
use MSC number
|
2020-11-23 12:18:44 -05:00 |
|
Hubert Chathi
|
f7a397dc90
|
add proposal for Single SSSS
|
2020-11-23 12:14:22 -05:00 |
|
Travis Ralston
|
11daaf6ea9
|
Add a small note about widgets
|
2020-11-22 18:58:36 -07:00 |
|
Travis Ralston
|
8cc3d44c2a
|
Generally wording changes; Change deprecation
|
2020-11-22 01:22:05 -07:00 |
|
Travis Ralston
|
09c569f1a7
|
Cover a case of no-op versions
|
2020-11-22 01:03:54 -07:00 |
|
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 |
|