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

3392 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston 683072e624
Merge pull request #1636 from turt2live/travis/c2s/id-server 
Clean up and flesh out all three editions of the /requestToken API
 2018-08-31 14:57:17 -06:00
Travis Ralston a1f655e5be Fix more error wording 2018-08-31 14:53:59 -06:00
Travis Ralston 108c623557
Merge pull request #1635 from turt2live/travis/c2s/read-markers 
Add read markers
 2018-08-31 14:47:39 -06:00
Richard van der Hoff 8773b9319b
Merge pull request #1599 from matrix-org/benpa/spec-tables-prettier 
Benpa/spec tables prettier
 2018-08-31 21:40:55 +01:00
Travis Ralston 84a2b7f3c0
Merge pull request #1632 from uhoreg/fix_room_member_state_key 
fix handling of multi-line state key descriptions
 2018-08-31 14:38:58 -06:00
Travis Ralston 1261da209d Fix wording for the homeserver not allowing a particular 3pid 2018-08-31 14:38:22 -06:00
Travis Ralston dfe6d0d3b8
Merge pull request #1642 from turt2live/travis/c2s/pagination 
Generalize language for pagination
 2018-08-31 14:23:31 -06:00
Travis Ralston 835f5de387 Generalize the token name even more 2018-08-31 14:22:07 -06:00
Travis Ralston f299fe023a English 2018-08-31 12:51:31 -06:00
Travis Ralston e49ed5d1ec Changelog 2018-08-31 12:37:24 -06:00
Travis Ralston f4c5c209f3 Generalize language for pagination 
Previously the section was very strict in what pagination was, however this isn't the reality for the matrix specification. Several endpoints have their own pagination naming conventions and do not follow those mandated by this section.

This commit generalizes the language to cover those endpoints while also describing how pagination works. In particular, it describes the rough API shape to expect and how to deal with the responses.

This commit also removes the `M_BAD_PAGINATION` error as it is not used in the real world. Homeservers are instead encouraged to use the standard `M_INVALID_PARAM` or similar error code.

Fixes https://github.com/matrix-org/matrix-doc/issues/610
Fixes https://github.com/matrix-org/matrix-doc/issues/1523
 2018-08-31 12:36:08 -06:00
Travis Ralston 824ce22caa Add additional clarity to the requestToken errors 2018-08-31 11:41:46 -06:00
Travis Ralston 5bb7eca8e8 English 2018-08-31 11:37:37 -06:00
Hubert Chathi c0dd7e0025
Merge pull request #1420 from Zil0/encrypted_attach 
Document encrypted attachments
 2018-08-31 13:33:05 -04:00
Travis Ralston 60dd9231e0 Don't explain how the IS might accept a 3pid 
The IS is bound to it's own set of specifications, and if the client chose this API then they should be aware of the risks but not necessarily arbitrary alternatives.
 2018-08-31 11:26:28 -06:00
Travis Ralston 63fdd72f73 Fix error description on /account/3pid/email/requestToken 2018-08-31 11:24:35 -06:00
Travis Ralston 25a461b86e
Merge pull request #1617 from turt2live/travis/c2s/rich-replies 
Add rich replies
 2018-08-31 11:21:34 -06:00
Travis Ralston 4b9fb99644 Take out unhelpful example 2018-08-31 11:18:54 -06:00
Travis Ralston f6d9e53f5c Clarify that homeserver must reject clients from setting m.fully_read 2018-08-31 11:13:32 -06:00
Travis Ralston 2e8151999e Clarify that read markers are fully read markers 2018-08-31 11:13:19 -06:00
Hubert Chathi f1f32d3a15 add more clarifications 2018-08-31 12:59:57 -04:00
Travis Ralston 679ddabb53 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers 2018-08-31 10:34:19 -06:00
Travis Ralston a4c2b2b905 General clarity and spelling for the requestToken APIs 2018-08-31 10:32:30 -06:00
Travis Ralston 7f1b94c211 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/id-server 2018-08-31 10:29:09 -06:00
Travis Ralston 567843e043 Add additional clarity to how rich replies are structured and used 2018-08-31 10:20:26 -06:00
Hubert Chathi e3daf10bb9 refactor encrypted file schema as "Extension to m.message" 2018-08-31 12:11:27 -04:00
Travis Ralston 9004be7bda Merge remote matrix-org/master 2018-08-31 10:08:05 -06:00
Travis Ralston 25778989a1
Merge pull request #1573 from turt2live/travis/c2s/sync-event-fields 
Fix event schemas for /sync
 2018-08-31 10:00:17 -06:00
Travis Ralston f013b7ef03
Merge pull request #1631 from turt2live/travis/general/unstable-warning 
Render a warning if the spec is unstable
 2018-08-31 09:50:37 -06:00
Travis Ralston ab00630ebc Don't include a second unstable warning in the s2s spec for now 2018-08-31 09:49:24 -06:00
Travis Ralston f72c821be4
Merge pull request #1619 from turt2live/travis/c2s/local-echo 
Reference that transaction IDs may be used to echo
 2018-08-31 09:48:02 -06:00
Travis Ralston e3ad253dca A sender is also required for the invite_state 2018-08-31 09:44:29 -06:00
Travis Ralston 2f824df8dd Define the real event types on the invite_state 2018-08-31 09:43:29 -06:00
Travis Ralston fc037b3a72 Fix merge 2018-08-31 09:33:30 -06:00
Travis Ralston 2e3e189ea2 Merge remote matrix-org/master 2018-08-31 09:31:39 -06:00
Travis Ralston 2e316ea80b
Merge pull request #1630 from matrix-org/application_service/release-r0.1.0 
r0.1.0 for the Application Service specification
 2018-08-31 09:12:47 -06:00
Travis Ralston 136ba15eb2
Merge pull request #1605 from turt2live/travis/c2s/clarify-html-again 
Mention that clients should not be producing invalid HTML
 2018-08-31 08:41:29 -06:00
Travis Ralston 38ae166e9d
Merge pull request #1505 from turt2live/travis/general/3pid_invite 
Clarify how third party invites work
 2018-08-31 08:38:40 -06:00
Travis Ralston afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags 
Update the room tagging documentation
 2018-08-31 08:36:40 -06:00
Travis Ralston c127eed7e7
Merge pull request #1600 from turt2live/travis/c2s/media-csp 
Specify the minimum CSP for media
 2018-08-31 08:32:33 -06:00
Travis Ralston 73736d41db
Merge pull request #1569 from turt2live/travis/c2s/user-directory 
Clarify the homeserver's behaviour for user searching
 2018-08-31 08:32:02 -06:00
Travis Ralston 9646d99c9e
Merge pull request #1602 from turt2live/travis/general/redactions 
Add the other fields the server is expected to keep on events
 2018-08-31 08:31:50 -06:00
Ben Parsons c77b505441 capitali[zs]e path parameters 2018-08-31 14:37:47 +01:00
Ben Parsons 778fe2a47a css caption size tweak 2018-08-31 14:29:46 +01:00
Ben Parsons e8afab1fe5 many visual improvements 2018-08-31 13:55:27 +01:00
Erik Johnston 6235c2e720
Merge pull request #1594 from matrix-org/erikj/limit_auth_events 
Reject events with superfluous auth_events entries
 2018-08-31 13:05:04 +01:00
Erik Johnston 080845ac1c Add link to previous section 2018-08-31 12:00:38 +01:00
Erik Johnston bbca5ce43a Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/limit_auth_events 2018-08-31 11:52:36 +01:00
Erik Johnston b6ed25e4b4 Fix incorrect indent 2018-08-31 11:32:29 +01:00
Erik Johnston f3a13eed76
Merge pull request #1593 from matrix-org/erikj/auth_events 
Update rules on which events to add to `auth_events`
 2018-08-31 11:27:03 +01:00