Commit Graph

6386 Commits (0f0caf582d9402212011bc38d9b8dff83eb6ca7b)
 

Author SHA1 Message Date
Will 9b2d9cf6b7
Add copyright statements to SCSS and JS; fix indentation for JS 4 years ago
wbamberg 1dadff5701
Set `author` and `private` in package.json
Co-authored-by: Travis Ralston <travpc@gmail.com>
4 years ago
Michael Telatynski c7063a4eec Iterate PR based on feedback 4 years ago
Travis Ralston 5800dcb654
Merge pull request #2844 from matrix-org/travis/msc/global-versioning
MSC2844: Global version number for the whole spec
4 years ago
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/
4 years ago
Slobodan Simić f5fd69ecfb Added translation using Weblate (Serbian) 4 years ago
Matthew Hodgson ff85e61be9 fix dev identifier 4 years ago
Matthew Hodgson a709671d03 tie break on multiple parents 4 years ago
Matthew Hodgson a0f89bd522 add XXX about via propagation 4 years ago
Matthew Hodgson b10856d49d let's create spaces with `events_default` PL100 4 years ago
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
4 years ago
Matthew Hodgson 97103c44cd clarify that auto-joins are not force joins 4 years ago
Matthew Hodgson 343e1f676b incorporate @joepie91's clarification on secret rooms 4 years ago
Matthew Hodgson f8fb32518d replace m.room.parent with m.space.parent for symmetry 4 years ago
Matthew Hodgson b8e3a0b45d include invite state notes 4 years ago
Matthew Hodgson a0d06c7bd7 factor out ACLs into a separate MSC 4 years ago
Matthew Hodgson 302d5d87b4 clarify autojoin and mention 'suggested' rooms 4 years ago
Matthew Hodgson 2de3dc4f70 more plurality fixing 4 years ago
Matthew Hodgson 42c332bd88 fix parent claiming plurality 4 years ago
Matthew Hodgson 803e70a8b3 typo 4 years ago
Matthew Hodgson 037894a641 replace 'default' with 'auto_join' 4 years ago
Will 9547ba1314
Ignore node_modules 4 years ago
Will 0abbb1857f
Comments for all the layout templates 4 years ago
Will 55eae7b70b
Render a single page of the spec in Hugo 4 years ago
Travis Ralston 46d843e8fa Make deprecation industry standard 4 years ago
Travis Ralston 124c8d43d3
Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
4 years ago
Travis Ralston 22acbea0ed
Apply suggestions from code review
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
4 years ago
Travis Ralston 7b4e702a69 Remove patch versions, policy stuff, etc 4 years ago
Hubert Chathi 2b32508964
Merge pull request #2951 from uhoreg/cross-signing-msc-clarifications
clarifications to cross-signing MSC
4 years ago
Hubert Chathi 7678884376 clarifications to cross-signing MSC 4 years ago
gkkulik db563171b6 Added translation using Weblate (Silesian) 4 years ago
Richard van der Hoff 69897584e1
Update proposals/1772-groups-as-rooms.md
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
4 years ago
Travis Ralston 7aded5be4d
Merge pull request #2928 from matrix-org/anoa/require_messages_in_sendtodevice
Make 'messages' a required JSON body field in /sendToDevice
4 years ago
Andrew Morgan ba7c0d7f8d Changelog 4 years ago
Andrew Morgan 0a53c86397 Make 'messages' a required JSON body field in /sendToDevice 4 years ago
Hubert Chathi f352de90c3
Merge pull request #2536 from uhoreg/cross-signing-spec
initial spec for cross-signing
4 years ago
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