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

5879 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Matthew Hodgson ff85e61be9 fix dev identifier 2021-01-15 11:19:45 +00:00
Matthew Hodgson a709671d03 tie break on multiple parents 2021-01-14 12:55:20 +00:00
Matthew Hodgson a0f89bd522 add XXX about via propagation 2021-01-14 02:23:59 +00:00
Matthew Hodgson b10856d49d let's create spaces with events_default PL100 2021-01-14 02:07:03 +00:00
Matthew Hodgson 91fe7a79b6 switch to allowing multiple parents 
to accomodate @Sorunome's use cases for secret rooms to exist in multiple spaces.
also remote , as we always have  now we use room ids
 2021-01-14 02:02:27 +00:00
Matthew Hodgson 97103c44cd clarify that auto-joins are not force joins 2021-01-14 01:39:52 +00:00
Matthew Hodgson 343e1f676b incorporate @joepie91's clarification on secret rooms 2021-01-14 01:37:05 +00:00
Matthew Hodgson f8fb32518d replace m.room.parent with m.space.parent for symmetry 2021-01-14 01:35:38 +00:00
Matthew Hodgson b8e3a0b45d include invite state notes 2021-01-14 01:34:34 +00:00
Matthew Hodgson a0d06c7bd7 factor out ACLs into a separate MSC 2021-01-14 01:34:10 +00:00
Matthew Hodgson 302d5d87b4 clarify autojoin and mention 'suggested' rooms 2021-01-13 17:29:43 +00:00
Matthew Hodgson 2de3dc4f70 more plurality fixing 2021-01-13 15:41:31 +00:00
Matthew Hodgson 42c332bd88 fix parent claiming plurality 2021-01-13 15:34:50 +00:00
Matthew Hodgson 803e70a8b3 typo 2021-01-13 14:18:39 +00:00
Matthew Hodgson 037894a641 replace 'default' with 'auto_join' 2021-01-13 14:01:17 +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
Richard van der Hoff 69897584e1
Update proposals/1772-groups-as-rooms.md 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2021-01-04 13:43:59 +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
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