Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-24 01:58:36 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5245 commits 30 branches 42 tags 32 MiB
Commit graph

815 commits

Author SHA1 Message Date
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
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
Richard van der Hoff 51aa5e2c40
Update proposals/1772-groups-as-rooms.md 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-11-26 17:54:54 +00:00
Richard van der Hoff 6cc3995ce8 explain a bit 2020-11-20 13:22:44 +00:00
Richard van der Hoff 45f260836d No cross-room auth 2020-11-20 13:19:22 +00:00
Peter Gervai 39af7f3249
Update 1772-groups-as-rooms.md (#2866) 
Typo.
 2020-11-17 15:30:17 +00:00
Richard van der Hoff d4abe40677 one parent per room 2020-11-16 11:57:04 +00:00
Richard van der Hoff 1f1e3c9a0f MSC1840 is in 2020-11-16 11:50:17 +00:00
Richard van der Hoff fbad757ceb update dependencies links 2020-11-11 17:52:16 +00:00
Richard van der Hoff e6a6941845 rename allowed_join again 2020-11-11 16:50:21 +00:00
Richard van der Hoff 3b2825f21d Descope autokick and rename allowed_spaces 2020-11-11 16:38:19 +00:00
Richard van der Hoff 4e3b0ed05f add a length limit to order 2020-11-11 16:03:32 +00:00
Richard van der Hoff b40f7da8d2 Record alternatives 
make sure we have records of dismissed alternatives
 2020-11-11 15:56:52 +00:00
Richard van der Hoff ae71a6219a Restricting room membership via spaces 2020-11-11 12:13:42 +00:00
Richard van der Hoff 29b07c11ad update power level mappings 2020-11-10 12:56:16 +00:00
Richard van der Hoff 06b5c8342f notes on children and recursion 2020-11-10 12:08:29 +00:00
Richard van der Hoff 109c31c2c8 Avoiding abuse via false parent claims 2020-11-10 11:45:37 +00:00
Richard van der Hoff 839ea0e946 inheriting join rules 2020-11-09 15:11:59 +00:00
Richard van der Hoff a73dd9c371 clarification 2020-11-09 15:11:48 +00:00
Richard van der Hoff e323ade5f7 Switch to room IDs 2020-11-09 15:11:16 +00:00
Richard van der Hoff 1aede33b35 clarify introduction 2020-11-09 12:30:02 +00:00
Richard van der Hoff d42da585e5
Apply suggestions from code review 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2020-11-09 12:09:48 +00:00
Richard van der Hoff 11bb604c5e add an xxx 2020-10-30 18:47:37 +00:00
Richard van der Hoff 2f557daac1 Clarifications to room/space relationship 2020-10-30 18:46:05 +00:00
Richard van der Hoff e746aa3aad
Apply suggestions from code review 
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
 2020-10-30 11:16:32 +00:00
Richard van der Hoff 15f34e5be9 supporting trad PLs 2020-10-29 13:07:21 +00:00
Richard van der Hoff c145d398f7 Notes on propagating PLs etc 2020-10-29 11:23:48 +00:00
Richard van der Hoff 52853b57e1 more updates 2020-10-27 18:41:45 +00:00
Richard van der Hoff 4040254001 Update for new terminology and current thinking 2020-10-27 18:15:20 +00:00
Richard van der Hoff 0baf49abe8 We are not considering hidden-membership rooms yet 2020-10-20 12:12:28 +01:00
Richard van der Hoff 6464e90fd6 Merge branch 'master' into matthew/msc1772 2020-10-20 12:02:44 +01:00
Richard van der Hoff 96cd76c868 remove 'one big event' proposal 2020-10-20 12:00:53 +01:00
Richard van der Hoff 417501d8cc various minor edits 2020-10-20 12:00:43 +01:00
Travis Ralston 561043663f
Merge pull request #1960 from matrix-org/travis/msc/integrations/openid 
MSC1960: OpenID information exchange with widgets
 2020-09-20 11:46:35 -06:00
Travis Ralston c9e8326783 Reword following widget spec 2020-09-05 14:56:34 -06:00
Travis Ralston e304109289 fix widget example 2020-08-27 08:21:41 -06:00
Travis Ralston 4cb7e96b11
Apply suggestions from code review 
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2020-08-27 08:13:12 -06:00
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
 2020-08-23 08:51:31 -06:00
Travis Ralston 80214998f6 Various clarifications to structure 2020-08-21 08:34:35 -06:00
Travis Ralston df74c7dbe3 Merge branch 'master' into travis/msc/integrations/openid 2020-08-21 08:14:28 -06:00
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>
 2020-08-21 07:07:41 -06:00
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.
 2020-08-19 15:12:54 +01:00
Travis Ralston 9080c5f87f
Revert "Revert "MSC2033: Adding a device_id to /account/whoami"" 2020-08-18 08:53:34 -06:00
Travis Ralston ddc0d78e0c
Revert "MSC2033: Adding a device_id to /account/whoami" 2020-08-18 08:53:13 -06:00
Travis Ralston 0228cf8361
Merge pull request #2033 from matrix-org/travis/msc/whoami-device 
MSC2033: Adding a device_id to /account/whoami
 2020-08-18 08:47:00 -06:00
Travis Ralston 5c0f999503
Merge pull request #2689 from Awesome-Technologies/fix_guest_e2ee 
MSC2689: Fix E2EE for guests
 2020-07-29 08:18:35 -06:00
Travis Ralston 0973e88c7c
Merge pull request #2663 from matrix-org/rei/pushrules_define_enabled 
MSC2663: Errors for dealing with non-existent push rules
 2020-07-29 08:15:41 -06:00
Travis Ralston a96a014512
Merge pull request #2610 from matrix-org/rav/proposal/remove-oauth2-auth-type 
MSC2610: Remove `m.login.oauth2` User-Interactive Authentication type from the specification
 2020-07-28 10:01:36 -06:00