Commit Graph

1135 Commits (153df0495321a075fd53c63476a6fdc2c150b166)

Author SHA1 Message Date
Andrew Morgan 5c620de273 typo fix 4 years ago
Andrew Morgan 6a0d07c799 Public rooms directory backwards compatibility note 4 years ago
Andrew Morgan 51a7778217 typo 4 years ago
Andrew Morgan e99649cb84 Foreshadow power level requirements for approval/denial of knock 4 years ago
Andrew Morgan 336e5a2c7a
v6 -> v7
Co-authored-by: Travis Ralston <travpc@gmail.com>
4 years ago
Andrew Morgan 1f07f0dc9a MSC2998 4 years ago
Andrew Morgan 3735def108 Define room version 7 4 years ago
Andrew Morgan 42e01b8e91 Add join_rules to room chunks returned on a public room dir query 4 years ago
Travis Ralston 315cf67f6b
Merge pull request #2366 from uhoreg/key_verification_accept
MSC2366: Key verification flow additions: m.key.verification.ready and m.key.verification.done
4 years ago
Richard van der Hoff ba08c9fe36 notes on and alternatives 4 years ago
Richard van der Hoff 84346055e9
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
4 years ago
Richard van der Hoff 09d41c59b9 add 'brand' 4 years ago
Richard van der Hoff 0c18f83636 grammar clarifications 4 years ago
Richard van der Hoff 277ff682d6 Formatting tweaks 4 years ago
Alexey Rusakov 246a97e2be Add clarification as per review 4 years ago
Alexey Rusakov eca999382d Grammar 4 years ago
Kitsune Ral 3988979f82 Fix leftovers 4 years ago
Kitsune Ral 43e6470aca Drop 'group' in anticipation of #1772 4 years ago
Kitsune Ral a32d7f5027 Apply suggestions from code review 4 years ago
Hubert Chathi d9edb3fdf3
Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
4 years ago
Michael Telatynski 1d90cacf6e Merge branch 't3chguy/msc/multi-sso' of github.com:matrix-org/matrix-doc into t3chguy/msc/multi-sso 4 years ago
Michael Telatynski 85ccf93c6a Remove UIA stuff 4 years ago
Michael Telatynski 8be6540eaf
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.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
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
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 7678884376 clarifications to cross-signing MSC 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 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 6ccc548912 Revert "Merge branch 'travis/msc/1337-joined-rooms'"
This reverts commit 0961c7b0f7.
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 942e8b36e4 Convert to markdown verbatim 4 years ago
Andrew Morgan 7dcff8f2e1 Disallow invite->knock membership changes 4 years ago
Richard van der Hoff 51aa5e2c40
Update proposals/1772-groups-as-rooms.md
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
4 years ago
Michael Telatynski 153c55788d Add more explanation 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
Richard van der Hoff 6cc3995ce8 explain a bit 4 years ago
Richard van der Hoff 45f260836d No cross-room auth 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
Peter Gervai 39af7f3249
Update 1772-groups-as-rooms.md (#2866)
Typo.
4 years ago
Richard van der Hoff d4abe40677 one parent per room 4 years ago
Richard van der Hoff 1f1e3c9a0f MSC1840 is in 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
Richard van der Hoff fbad757ceb update dependencies links 4 years ago
Richard van der Hoff e6a6941845 rename allowed_join again 4 years ago
Richard van der Hoff 3b2825f21d Descope autokick and rename allowed_spaces 4 years ago
Richard van der Hoff 4e3b0ed05f add a length limit to `order` 4 years ago
Richard van der Hoff b40f7da8d2 Record alternatives
make sure we have records of dismissed alternatives
4 years ago
Richard van der Hoff ae71a6219a Restricting room membership via spaces 4 years ago
Travis Ralston 4dee8dbeab Versioning WIP 4 years ago
Travis Ralston 973ee1438c Progress checkpoint on room versions 4 years ago
Richard van der Hoff 29b07c11ad update power level mappings 4 years ago
Richard van der Hoff 06b5c8342f notes on children and recursion 4 years ago
Richard van der Hoff 109c31c2c8 Avoiding abuse via false `parent` claims 4 years ago
Richard van der Hoff 839ea0e946 inheriting join rules 4 years ago
Richard van der Hoff a73dd9c371 clarification 4 years ago
Richard van der Hoff e323ade5f7 Switch to room IDs 4 years ago
Richard van der Hoff 1aede33b35 clarify introduction 4 years ago
Michael Telatynski a7eba773be Fix MSC number 4 years ago
Michael Telatynski 204732099b Multiple SSO Identity Providers 4 years ago
Richard van der Hoff d42da585e5
Apply suggestions from code review
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
4 years ago
Travis Ralston c4d01b90e9
Merge pull request #2765 from matrix-org/travis/msc/widget-avatars
MSC2765: Widget avatars
4 years ago
Travis Ralston 5f8b7167a5 What if we versioned the whole spec? 4 years ago
Richard van der Hoff 11bb604c5e add an xxx 4 years ago
Richard van der Hoff 2f557daac1 Clarifications to room/space relationship 4 years ago
Richard van der Hoff e746aa3aad
Apply suggestions from code review
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
4 years ago
Richard van der Hoff 15f34e5be9 supporting trad PLs 4 years ago
Richard van der Hoff 5db56391f3
spelling 4 years ago
Richard van der Hoff c145d398f7 Notes on propagating PLs etc 4 years ago
Richard van der Hoff 52853b57e1 more updates 4 years ago
Richard van der Hoff 4040254001 Update for new terminology and current thinking 4 years ago
Travis Ralston 4ee990e26f
Merge pull request #2758 from matrix-org/rav/proposals/textual_identifier_grammar
MSC2758: Proposal for a common identifier grammar
4 years ago
Travis Ralston ee55d9d35b
Update proposals/2765-widget-avatars.md
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
4 years ago
Richard van der Hoff 49ce93f3e2
Update 2758-textual-id-grammar.md 4 years ago
Richard van der Hoff 0baf49abe8 We are not considering hidden-membership rooms yet 4 years ago
Richard van der Hoff 6464e90fd6 Merge branch 'master' into matthew/msc1772 4 years ago
Richard van der Hoff 96cd76c868 remove 'one big event' proposal 4 years ago
Richard van der Hoff 417501d8cc various minor edits 4 years ago
Hubert Chathi 7b3c98cd98 we're using the binary format 4 years ago
Travis Ralston 411202f2bf
spelling
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
4 years ago
Andrew Morgan 815dae6eae Note that redactions of knocks are not a concern 4 years ago
Travis Ralston 9e66d32225
Merge pull request #2414 from iinuwa/master
MSC2414: Make reason and score parameters optional for reporting content
4 years ago
Andrew Morgan a924f5b3d5 Fix incorrect assumptions about the sender field of a knock event
Got a bit confused with the sender and state_key being different in invite
membership events. In case of a knock, even if the knock event is being
inserted into the room by another homeserver over federation, the sender
of the event is still the knocking user, just like the state_key.
4 years ago
Andrew Morgan 525d1d33e0 Some clarifications and wording fixes 4 years ago
iinuwa 02512f0f69
Use endpoint instead of API
Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com>
4 years ago
Travis Ralston 51b278e015 Mention the endpoint 4 years ago
Richard van der Hoff 12da19f927 Words on e2ee events 4 years ago
Richard van der Hoff 46440b0e75 On why you should never trust an event. 4 years ago
Andrew Morgan 6f7bcb6052 Explicitly state what changes to the auth rules are necessary 4 years ago
Andrew Morgan 5097fad4e7 Fix unstable prefix bullet points 4 years ago
Kitsune Ral 11d2529a5e Allow custom query items 4 years ago
Andrew Morgan 6b99228386 Remove section duplicated by membership change section 4 years ago
Andrew Morgan fd8176b93d Clarify endpoint calls clients and servers need to use to handle knocks 4 years ago
Andrew Morgan 9e5ac042ac Explicitly state that the hs that received the knock must put in the room 4 years ago
Andrew Morgan e58e207bbf Go into more depth about membership changes surrounding knocking 4 years ago
Kitsune Ral a2fa637396 Refactor of non-normative sections
Including a few more words regarding the "minimal encoded"
(aka "keep sigils") alternative.
4 years ago
Kitsune Ral 758c57b021 More cleanup 4 years ago
Kitsune Ral 6f082bbe12 Be clearer about percent-en/decoding 4 years ago
Kitsune Ral bbc8bfc1c0 Rework the path grammar for better clarity 4 years ago
Kitsune Ral 907bd2e2a2 Rewording, clarifications, minor fixes 4 years ago
Kitsune Ral 438e5a368f Add URI operations and construction algorithm 4 years ago
iinuwa 07dbdab898
Fix typos 4 years ago
iinuwa 9be28c5ade
Add proposal to remove score; reorganize 4 years ago
Travis Ralston 2ccdcead9c Fix number 4 years ago
Travis Ralston 9f06c0a2e2 What if we make v6 as the default? 4 years ago
Travis Ralston 561043663f
Merge pull request #1960 from matrix-org/travis/msc/integrations/openid
MSC1960: OpenID information exchange with widgets
4 years ago
Andrew Morgan 340f888de3 Mention unstable prefixes for sync, join_rules and membership events 4 years ago
Andrew Morgan 6e47e86f01 Add unstable endpoint replacements 4 years ago
Travis Ralston b3116e4a3c Proposal to have widgets aware of their widget ID 4 years ago
Travis Ralston c9e8326783 Reword following widget spec 4 years ago
Andrew Morgan fd9d57b8c4 Match state events sent to a remote server when inviting a user 4 years ago
Andrew Morgan 630f7c458c Allow users to knock over and over, removing CS complexity 4 years ago
Andrew Morgan 61fea58ce0 Merge branch 'soru/knock' of github.com:sorunome/matrix-doc into soru/knock 4 years ago
Andrew Morgan 703fa07028 Remove extraneous text 4 years ago
Travis Ralston 70e69a110a Move the avatar up a level 4 years ago