Commit graph

4772 commits

Author SHA1 Message Date
Andrew Morgan 74a341ab8d Mention that knock -> ban is possible 2020-08-21 15:36:38 +01:00
Andrew Morgan 39c21689ce small grammar 2020-08-21 15:30:30 +01:00
Andrew Morgan de038f5601 Fix the response format of send_knock
This aligns with the current v2 federation endpoints. However, we're still using v1
as a prefix here as it is still the first version of this endpoint.
2020-08-17 14:30:28 +01:00
Andrew Morgan 38d67083eb Note that spam is a preventable, but real possibility as a result 2020-08-17 14:27:59 +01:00
Andrew Morgan c92752d1b8 Reflow text to <79 chars 2020-08-17 14:25:34 +01:00
Andrew Morgan d47cb1fec3 Small grammatical fixes 2020-08-17 14:23:33 +01:00
Sorunome 5ae462d558
address issues 2020-02-07 19:50:22 +01:00
Sorunome 53435d400d
update with new endpoints 2020-01-19 13:30:46 +01:00
Sorunome 776436a5f0
forgot to update one json example 2020-01-13 12:54:06 +01:00
Sorunome f0411a3cc5
make clear displayname and avatar_url are optional, add status codes 2020-01-13 12:52:22 +01:00
Sorunome 13964988f4
remove question regarding federation api version, as it has to be v2 2020-01-09 20:08:19 +01:00
Sorunome 1ef7c17b93
remove stray heading 2020-01-09 20:00:25 +01:00
Sorunome bee4e9e269
move to correct msc number 2020-01-09 19:57:24 +01:00
Sorunome 501d7ecfd5
add knock proposal 2020-01-09 19:55:44 +01:00
Matthew Hodgson 4808b60cdd
Merge pull request #2396 from aaronraimist/v4-event-id-link
Fix link to v4 event ID format in identity service spec
2020-01-02 08:40:08 +00:00
Aaron Raimist 82a626a98a Fix link to v4 event ID format in identity service spec
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-01-02 02:30:29 -06:00
Travis Ralston 6c48e77878
Merge pull request #2395 from matrix-org/travis/tags-push
Add missing tags to push rules endpoints
2020-01-01 15:58:27 -07:00
Travis Ralston f59aa563dd Add missing tags to push rules endpoints
Without the tags, the endpoints don't end up in the swagger. No changelog for this because it doesn't affect the spec itself.
2020-01-01 11:59:37 -07:00
Travis Ralston 224a103355
Merge pull request #2392 from matrix-org/travis/s2s/fix-auth
Move auth events selection to a more appropriate section of the spec
2019-12-31 15:47:13 -07:00
Travis Ralston 912b3cbc95 Move auth events selection to a more appropriate section of the spec
This was pretty buried, and feels like a common question.
2019-12-30 16:29:56 -07:00
Travis Ralston f11f77f33b
Merge pull request #2386 from carbeer/patch-1
Change state_type to event_type
2019-12-15 15:31:08 -07:00
Carolin Beer 3aba6e3eeb
Change state_type to event_type
I couldn't find any other reference to a state_type within the entire specification. I assume this is supposed to be the event_type? This aligns with the description of changes resulting from a state update.
2019-12-15 14:37:10 +01:00
Travis Ralston c823bdbf70
Merge pull request #2384 from matrix-org/travis/pr-templates
Add some github stuff (PR templates, funding)
2019-12-09 09:14:00 -07:00
Travis Ralston 47b94b62c4 Add some github stuff (PR templates, funding) 2019-12-07 15:57:24 -07:00
Travis Ralston 21b50d749a
Merge pull request #2369 from iinuwa/token-auth-doc-tweaks
Rename nonce to txn_id. Reorganize for clarity.
2019-12-07 15:37:10 -07:00
Travis Ralston ccc7bcabbc id -> ID while we're here 2019-12-07 15:32:43 -07:00
Travis Ralston 7cfc4b09a6 Changelog 2019-12-07 15:31:42 -07:00
Travis Ralston b556ef3605
Merge pull request #2381 from Cadair/patch-1
Clarify description of user directory
2019-12-07 15:14:37 -07:00
Travis Ralston 4d0bd5b9e2 Changelog 2019-12-07 15:12:55 -07:00
Stuart Mumford c2ffef051f
Clarify description of user directory
Signed off by Stuart Mumford <stuart@cadair.com>
2019-12-05 09:27:37 -07:00
Hubert Chathi d7263861d8
Merge pull request #2371 from uhoreg/add_unstable_prefix_template
add unstable prefix section to proposal template
2019-12-03 14:37:49 -05:00
Travis Ralston 1cf322bc2a MSC2324: Facilitating early releases of software dependent on spec (#2324) 2019-12-03 18:43:56 +00:00
Hubert Chathi 75a6a28c6c
Merge pull request #2372 from matrix-org/jryans/clarify-cross-signing-examples
Clarify cross-signing examples
2019-12-02 16:30:01 -05:00
Travis Ralston e4deb4ca27
Merge pull request #2367 from matrix-org/erikj/invite_reject_reasons
MSC2367: Add reason field to all membership events
2019-12-02 08:12:13 -07:00
J. Ryan Stinnett 71faffc9ed Update example to show keys wrapped by user ID 2019-12-02 14:59:48 +00:00
J. Ryan Stinnett c549bf201b Clarify POST instead of GET for federation key query 2019-12-02 14:54:59 +00:00
Hubert Chathi b7234c7fd3 add unstable prefix section to proposal template 2019-11-29 15:51:50 -05:00
Isaiah Inuwa ad383351c2 Rename nonce to txn_id. Reorganize for clarity.
Signed-Off-By: Isaiah Inuwa <isaiah.inuwa@gmail.com>
2019-11-29 10:25:38 -06:00
Travis Ralston f37aa30c43
Merge pull request #1756 from uhoreg/cross-signing2
MSC1756: cross-signing devices using a master identity key
2019-11-26 10:00:44 -07:00
Erik Johnston f054ffe760 Add note about using PUT /state/m.room.member/ 2019-11-26 11:40:38 +00:00
Erik Johnston 29745d04fb erikj/msc_membership_reasons 2019-11-26 11:22:42 +00:00
Travis Ralston 2a82a5c27c
Merge pull request #2313 from matrix-org/msc2313
MSC2313: Moderation policies as rooms (ban lists)
2019-11-25 09:17:33 -07:00
Hubert Chathi 82260689c9 add link to migrating from device verifications 2019-11-20 11:55:10 -05:00
Hubert Chathi 3b2f897c7e
Apply suggestions from code review
Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>
2019-11-20 11:48:36 -05:00
Travis Ralston c7b3d99853 m.policy.rule won the debate 2019-11-19 11:53:07 -07:00
Travis Ralston f1ff31d2cb
Merge pull request #2284 from matrix-org/travis/msc/optional-is-discover
MSC2284: Making the identity server optional during discovery
2019-11-18 10:15:48 -07:00
Travis Ralston f610235cd6 Rename the MSC to be better targeted 2019-11-18 09:38:17 -07:00
Travis Ralston e89d81c587
Merge pull request #2351 from MurzNN/patch-2
Typo: later user » later use
2019-11-13 10:37:41 -07:00
Travis Ralston d93d8fe9b5 Add a changelog 2019-11-13 10:36:41 -07:00
Travis Ralston 605f3390c7
Merge pull request #1946 from uhoreg/ssss
MSC1946: Secure Secret Storage and Sharing
2019-11-13 10:07:05 -07:00