Commit Graph

6692 Commits (b0115a96132543d4e62faadd1a3513927a88463c)
 

Author SHA1 Message Date
Isaiah Inuwa 692d039a2b Merge branch 'master' of github.com:iinuwa/matrix-doc 5 years ago
Sorunome 776436a5f0
forgot to update one json example 5 years ago
Sorunome f0411a3cc5
make clear displayname and avatar_url are optional, add status codes 5 years ago
Sorunome 13964988f4
remove question regarding federation api version, as it has to be v2 5 years ago
Sorunome 1ef7c17b93
remove stray heading 5 years ago
Sorunome bee4e9e269
move to correct msc number 5 years ago
Sorunome 501d7ecfd5
add knock proposal 5 years ago
Hubert Chathi 654a9574be rename to match MSC number 5 years ago
Hubert Chathi c87802587a fix typos, add information 5 years ago
Matthew Hodgson 4808b60cdd
Merge pull request #2396 from aaronraimist/v4-event-id-link
Fix link to v4 event ID format in identity service spec
5 years ago
Aaron Raimist 82a626a98a Fix link to v4 event ID format in identity service spec
Signed-off-by: Aaron Raimist <aaron@raim.ist>
5 years ago
Travis Ralston 6c48e77878
Merge pull request #2395 from matrix-org/travis/tags-push
Add missing tags to push rules endpoints
5 years ago
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.
5 years ago
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
5 years ago
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.
5 years ago
iinuwa 6005c16b60
Merge pull request #1 from matrix-org/master
Merge from origin
5 years ago
Hubert Chathi a62c817745
Apply suggestions from code review
Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>
5 years ago
Hubert Chathi 90bf2b3b46 add changelog 5 years ago
Hubert Chathi 4cde800ea1 fix validation errors 5 years ago
Hubert Chathi 59e337187b remove duplicated line 5 years ago
Hubert Chathi e658b17070 initial version of spec for key backups 5 years ago
Hubert Chathi e2e83b130d initial proposal for reporting of withheld keys 5 years ago
Travis Ralston f11f77f33b
Merge pull request #2386 from carbeer/patch-1
Change state_type to event_type
5 years ago
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.
5 years ago
Travis Ralston c823bdbf70
Merge pull request #2384 from matrix-org/travis/pr-templates
Add some github stuff (PR templates, funding)
5 years ago
Travis Ralston 47b94b62c4 Add some github stuff (PR templates, funding) 5 years ago
Travis Ralston 21b50d749a
Merge pull request #2369 from iinuwa/token-auth-doc-tweaks
Rename nonce to txn_id. Reorganize for clarity.
5 years ago
Travis Ralston ccc7bcabbc id -> ID while we're here 5 years ago
Travis Ralston 7cfc4b09a6 Changelog 5 years ago
Travis Ralston b556ef3605
Merge pull request #2381 from Cadair/patch-1
Clarify description of user directory
5 years ago
Travis Ralston 4d0bd5b9e2 Changelog 5 years ago
Stuart Mumford c2ffef051f
Clarify description of user directory
Signed off by Stuart Mumford <stuart@cadair.com>
5 years ago
Hubert Chathi 22f7eaae0c add example 5 years ago
Hubert Chathi d7263861d8
Merge pull request #2371 from uhoreg/add_unstable_prefix_template
add unstable prefix section to proposal template
5 years ago
Travis Ralston 1cf322bc2a MSC2324: Facilitating early releases of software dependent on spec (#2324) 5 years ago
Hubert Chathi 75a6a28c6c
Merge pull request #2372 from matrix-org/jryans/clarify-cross-signing-examples
Clarify cross-signing examples
5 years ago
Travis Ralston e4deb4ca27
Merge pull request #2367 from matrix-org/erikj/invite_reject_reasons
MSC2367: Add reason field to all membership events
5 years ago
J. Ryan Stinnett 71faffc9ed Update example to show keys wrapped by user ID 5 years ago
J. Ryan Stinnett c549bf201b Clarify POST instead of GET for federation key query 5 years ago
Hubert Chathi 17abe054f2 send m.key.verification.cancel to other devices when one device is ready 5 years ago
Hubert Chathi b7234c7fd3 add unstable prefix section to proposal template 5 years ago
Isaiah Inuwa ad383351c2 Rename nonce to txn_id. Reorganize for clarity.
Signed-Off-By: Isaiah Inuwa <isaiah.inuwa@gmail.com>
5 years ago
Hubert Chathi 5742c30a96 s/accept/ready/ because we already have an m.key.verification.accept 5 years ago
Hubert Chathi 5f5f99fcc1 wording tweaks 5 years ago
Travis Ralston f37aa30c43
Merge pull request #1756 from uhoreg/cross-signing2
MSC1756: cross-signing devices using a master identity key
5 years ago
Erik Johnston f054ffe760 Add note about using PUT /state/m.room.member/ 5 years ago
Erik Johnston 29745d04fb erikj/msc_membership_reasons 5 years ago
Hubert Chathi abbba4788c rename to match MSC number 5 years ago
Hubert Chathi 33df2d1414 initial proposal of `m.key.verification.accept` 5 years ago
Travis Ralston 2a82a5c27c
Merge pull request #2313 from matrix-org/msc2313
MSC2313: Moderation policies as rooms (ban lists)
5 years ago