Commit Graph

818 Commits (a0d06c7bd795275f083594c821b72e7e053a8125)

Author SHA1 Message Date
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
Richard van der Hoff 69897584e1
Update proposals/1772-groups-as-rooms.md
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
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
Richard van der Hoff 6cc3995ce8 explain a bit 4 years ago
Richard van der Hoff 45f260836d No cross-room auth 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
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
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
Richard van der Hoff d42da585e5
Apply suggestions from code review
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
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 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
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
Travis Ralston 561043663f
Merge pull request #1960 from matrix-org/travis/msc/integrations/openid
MSC1960: OpenID information exchange with widgets
4 years ago
Travis Ralston c9e8326783 Reword following widget spec 4 years ago
Travis Ralston e304109289 fix widget example 4 years ago
Travis Ralston 4cb7e96b11
Apply suggestions from code review
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
4 years ago
Travis Ralston 3943e63ae2
Merge pull request #2738 from matrix-org/revert-2737-revert-2033-travis/msc/whoami-device
TBD: MSC2033: Adding a device_id to /account/whoami
4 years ago
Travis Ralston 80214998f6 Various clarifications to structure 4 years ago
Travis Ralston df74c7dbe3 Merge branch 'master' into travis/msc/integrations/openid 4 years ago
Travis Ralston 6490fda6ee
Apply suggestions from code review
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
4 years ago
Richard van der Hoff c00710d91a Revert "Merge pull request #1598 from matrix-org/rav/proposals/id_grammar"
This reverts commit d9135ef902, reversing
changes made to f714aaadd0.

People are getting confused by the fact this has been merged.
4 years ago
Travis Ralston 9080c5f87f
Revert "Revert "MSC2033: Adding a device_id to /account/whoami"" 4 years ago
Travis Ralston ddc0d78e0c
Revert "MSC2033: Adding a device_id to /account/whoami" 4 years ago
Travis Ralston 0228cf8361
Merge pull request #2033 from matrix-org/travis/msc/whoami-device
MSC2033: Adding a device_id to /account/whoami
4 years ago