Commit graph

5622 commits

Author SHA1 Message Date
Travis Ralston e865f59c65
Merge pull request #2807 from wbamberg/msc2414-reporting-content-parameters
Make score and reason optional in content reporting API (MSC2414)
2020-10-07 10:47:47 -06:00
Will 89d53fd688
Add changelog entry 2020-10-07 09:42:46 -07:00
Will 6c9b25a397
Make score and reason parameters optional in content reporting API (MSC2414) 2020-10-07 09:38:03 -07:00
Travis Ralston 9e66d32225
Merge pull request #2414 from iinuwa/master
MSC2414: Make reason and score parameters optional for reporting content
2020-10-07 08:08:48 -06:00
Travis Ralston ea5c8ba649
Merge pull request #2806 from wbamberg/remove-toc-bullets
Suppress bullets inside table of contents
2020-10-06 16:06:32 -06:00
Will deef4f5e7c
Suppress bullets inside table of contents 2020-10-06 14:03:37 -07:00
Travis Ralston e20121cbab
Merge pull request #2803 from matrix-org/travis/spec/v6
Update the default recommended room version to v6
2020-10-05 15:47:47 -06:00
Travis Ralston 56e0ee700a Update the default recommended room version to v6
No changelog required - this is the index

MSC: https://github.com/matrix-org/matrix-doc/pull/2788
2020-10-05 15:17:08 -06:00
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.
2020-10-05 20:24:56 +01:00
Andrew Morgan 525d1d33e0 Some clarifications and wording fixes 2020-10-05 17:09:33 +01:00
Travis Ralston 82a4a028bd
Merge pull request #2788 from matrix-org/travis/msc/v6-default
MSC2788: Room version 6 as the default room version
2020-10-04 21:13:36 -06:00
iinuwa 02512f0f69
Use endpoint instead of API
Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com>
2020-10-02 09:12:18 -05:00
Travis Ralston 51b278e015 Mention the endpoint 2020-10-02 07:42:35 -06:00
Richard van der Hoff 12da19f927 Words on e2ee events 2020-10-02 09:26:59 +01:00
Richard van der Hoff 46440b0e75 On why you should never trust an event. 2020-10-01 23:33:17 +01:00
Andrew Morgan 6f7bcb6052 Explicitly state what changes to the auth rules are necessary 2020-10-01 18:49:41 +01:00
Andrew Morgan 5097fad4e7 Fix unstable prefix bullet points 2020-10-01 17:43:49 +01:00
Andrew Morgan 6b99228386 Remove section duplicated by membership change section 2020-10-01 17:25:19 +01:00
Andrew Morgan fd8176b93d Clarify endpoint calls clients and servers need to use to handle knocks 2020-10-01 17:09:10 +01:00
Andrew Morgan 9e5ac042ac Explicitly state that the hs that received the knock must put in the room 2020-10-01 16:35:39 +01:00
Andrew Morgan e58e207bbf Go into more depth about membership changes surrounding knocking 2020-10-01 16:20:15 +01:00
Travis Ralston 5e60ff8bfd Add 404 error responses to push rule endpoints
MSC: https://github.com/matrix-org/matrix-doc/pull/2663
2020-09-30 13:56:12 -06:00
Travis Ralston 5a7bda4bf8 Changelog 2020-09-30 13:45:22 -06:00
Travis Ralston 2d047e312f Add membership reasons to the spec for all membership events
MSC: https://github.com/matrix-org/matrix-doc/pull/2367
2020-09-30 13:43:56 -06:00
iinuwa 07dbdab898
Fix typos 2020-09-23 16:37:26 -05:00
iinuwa 9be28c5ade
Add proposal to remove score; reorganize 2020-09-23 16:34:46 -05:00
Travis Ralston 2ccdcead9c Fix number 2020-09-23 07:48:28 -06:00
Travis Ralston 9f06c0a2e2 What if we make v6 as the default? 2020-09-23 07:46:38 -06: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 81c7893a6e sync translations for sas emoji 2020-09-16 14:48:20 -06:00
Andrew Morgan 340f888de3 Mention unstable prefixes for sync, join_rules and membership events 2020-09-16 16:05:27 +01:00
Andrew Morgan 6e47e86f01 Add unstable endpoint replacements 2020-09-16 15:57:12 +01:00
Travis Ralston b3116e4a3c Proposal to have widgets aware of their widget ID 2020-09-11 13:36:46 -06:00
Travis Ralston 89a3663372
Delete SECURITY.md 2020-09-08 14:30:22 -06:00
Travis Ralston c25121974e
Create SECURITY.md 2020-09-08 14:28:03 -06:00
Travis Ralston c9e8326783 Reword following widget spec 2020-09-05 14:56:34 -06:00
Travis Ralston a085fabd42
Merge pull request #2763 from matrix-org/travis/fix-push-tweaks
Add a link to the push module in the push gateway spec
2020-09-04 09:15:58 -06:00
Andrew Morgan fd9d57b8c4 Match state events sent to a remote server when inviting a user 2020-09-04 14:38:29 +01:00
Andrew Morgan 630f7c458c Allow users to knock over and over, removing CS complexity 2020-09-04 14:26:15 +01:00
Travis Ralston 614e95289a
Merge pull request #2766 from RiotTranslateBot/weblate-matrix-doc-sas-emoji-v1
Update from Weblate
2020-09-03 09:33:47 -06:00
Weblate 6ad347e3d6 Merge branch 'origin/master' into Weblate. 2020-09-03 15:32:58 +00:00
Andrew Morgan 61fea58ce0 Merge branch 'soru/knock' of github.com:sorunome/matrix-doc into soru/knock 2020-09-03 16:08:46 +01:00
Andrew Morgan 703fa07028 Remove extraneous text 2020-09-03 16:07:16 +01:00
Travis Ralston 70e69a110a Move the avatar up a level 2020-09-03 09:00:36 -06:00
Travis Ralston d8bc158a3b Renumber 2020-09-03 08:55:27 -06:00
Travis Ralston 1f734cd4a9 Proposal to support widget avatars 2020-09-03 08:53:10 -06:00
Andrew Morgan 58cb299dde
Update proposals/2403-knock.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2020-09-03 13:47:20 +01:00
Andrew Morgan c9a7b442ff Merge branch 'soru/knock' of github.com:sorunome/matrix-doc into soru/knock
* 'soru/knock' of github.com:sorunome/matrix-doc:
  Federation knock_room_state and minor cleanup
2020-09-02 23:15:26 +01:00
Travis Ralston 2877459553 Add a link to the push module in the push gateway spec 2020-09-02 14:04:55 -06:00
Richard van der Hoff 998dec2980
Update proposals/2758-textual-id-grammar.md 2020-09-02 17:50:15 +01:00