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
5636 commits 30 branches 42 tags 32 MiB
Commit graph

5636 commits

This branch
This branch
All branches
Author SHA1 Message Date
wbamberg 636974948d
Merge pull request #2959 from wbamberg/first-page 
Basic machinery for the new spec platform
 2021-01-19 09:10:20 -08:00
Michael Telatynski 1d90cacf6e Merge branch 't3chguy/msc/multi-sso' of github.com:matrix-org/matrix-doc into t3chguy/msc/multi-sso 2021-01-19 13:53:10 +00:00
Michael Telatynski 85ccf93c6a Remove UIA stuff 2021-01-19 13:52:57 +00:00
Michael Telatynski 8be6540eaf
Update proposals/2858-Multiple-SSO-Identity-Providers.md 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-01-19 13:43:49 +00:00
Will 9fd35dad78
Use a different directory for assets 2021-01-18 11:48:42 -08:00
Will 985d681645
Use GFM table style 2021-01-18 11:46:05 -08:00
Will 9b2d9cf6b7
Add copyright statements to SCSS and JS; fix indentation for JS 2021-01-18 11:09:09 -08:00
wbamberg 1dadff5701
Set author and private in package.json 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-01-18 10:44:06 -08:00
Michael Telatynski c7063a4eec Iterate PR based on feedback 2021-01-18 09:30:07 +00:00
Travis Ralston 5800dcb654
Merge pull request #2844 from matrix-org/travis/msc/global-versioning 
MSC2844: Global version number for the whole spec
 2021-01-17 12:58:42 -07:00
Slobodan Simić 3bed1ada3d Translated using Weblate (Serbian) 
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/sr/
 2021-01-16 23:35:45 +00:00
Slobodan Simić f5fd69ecfb Added translation using Weblate (Serbian) 2021-01-15 22:40:33 +00:00
Will 9547ba1314
Ignore node_modules 2021-01-12 21:02:38 -08:00
Will 0abbb1857f
Comments for all the layout templates 2021-01-12 20:45:24 -08:00
Will 55eae7b70b
Render a single page of the spec in Hugo 2021-01-12 15:31:01 -08:00
Travis Ralston 46d843e8fa Make deprecation industry standard 2021-01-12 09:52:50 -07:00
Travis Ralston 124c8d43d3
Apply suggestions from code review 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2021-01-12 09:22:06 -07:00
Travis Ralston 22acbea0ed
Apply suggestions from code review 
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
 2021-01-09 20:38:58 -07:00
Travis Ralston 7b4e702a69 Remove patch versions, policy stuff, etc 2021-01-09 20:33:20 -07:00
Hubert Chathi 2b32508964
Merge pull request #2951 from uhoreg/cross-signing-msc-clarifications 
clarifications to cross-signing MSC
 2021-01-08 19:47:33 -05:00
Hubert Chathi 7678884376 clarifications to cross-signing MSC 2021-01-08 17:48:03 -05:00
gkkulik db563171b6 Added translation using Weblate (Silesian) 2021-01-08 22:27:19 +00:00
Travis Ralston 7aded5be4d
Merge pull request #2928 from matrix-org/anoa/require_messages_in_sendtodevice 
Make 'messages' a required JSON body field in /sendToDevice
 2020-12-29 11:21:21 -07:00
Andrew Morgan ba7c0d7f8d Changelog 2020-12-29 18:18:49 +00:00
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
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
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