Commit Graph

203 Commits

Author SHA1 Message Date
Anatoly Sablin 4bec3d6dd8 Avoid duplicates. 2019-02-24 19:43:03 +03:00
Anatoly Sablin d4b4d92b82 Fix the m.push_rules type (switch from the state event to the common event). 2019-02-16 00:24:26 +03:00
Anatoly Sablin 2de7ef9a3d Add the m.push_rules schema. 2019-02-15 23:23:38 +03:00
Travis Ralston b85f7bb248 Add room version upgrades
Implements https://github.com/matrix-org/matrix-doc/issues/1501
2019-01-09 17:02:09 -07:00
Travis Ralston 1268b421ec
Update the m.presence schema to include status_msg 2018-12-10 15:44:01 -07:00
Travis Ralston e4a8fed0e8 Power levels always have a default of 50 for state_default
As per the proposal https://github.com/matrix-org/matrix-doc/issues/1304
2018-09-04 11:43:37 -06:00
Travis Ralston 108c623557
Merge pull request from turt2live/travis/c2s/read-markers
Add read markers
2018-08-31 14:47:39 -06:00
Hubert Chathi c0dd7e0025
Merge pull request from Zil0/encrypted_attach
Document encrypted attachments
2018-08-31 13:33:05 -04: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
Hubert Chathi e3daf10bb9 refactor encrypted file schema as "Extension to m.message" 2018-08-31 12:11:27 -04: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 afa16f1e4e
Merge pull request from turt2live/travis/c2s/room-tags
Update the room tagging documentation
2018-08-31 08:36:40 -06:00
Travis Ralston f923d08078 Add read markers
This is the spec for https://github.com/matrix-org/matrix-doc/issues/910

Fixes https://github.com/matrix-org/matrix-doc/issues/910

Some reverse engineering was required to work out the complete details as to how this works. In particular, the 405 for setting account data and the behaviour of m.read.

References:
* 405 for account data: d69decd5c7/synapse/rest/client/v2_alpha/account_data.py (L85-L90)
* m.read behaviour: d69decd5c7/synapse/rest/client/v2_alpha/read_marker.py (L45-L52)
2018-08-30 16:21:31 -06:00
Hubert Chathi 4230e375fa
Merge pull request from Zil0/key_sharing
Document key sharing events
2018-08-29 23:05:17 -04:00
Kitsune Ral 9bc1470305 Elaborate the structure of m.tag events
...and corresponding structures in tag-related CS API calls

Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
2018-08-29 14:47:59 -06:00
Travis Ralston c83da453b5 s/number/integer 2018-08-29 14:18:41 -06:00
Travis Ralston 26d5a24b88 Merge remote matrix-org/master 2018-08-29 14:17:21 -06:00
Travis Ralston c297c6a35d Update schemas and auth rules to cover the @ state key restriction
Fixes https://github.com/matrix-org/matrix-doc/issues/1305

Also fixes an issue regarding the `_` being restricted previously, which is false.
2018-08-28 13:06:52 -06:00
Travis Ralston ee3b0f42db Fix server ACL schema: The type is a string
It cannot be an enum otherwise the build starts screaming.
2018-08-28 10:34:49 -06:00
Travis Ralston 6cdb463829
Merge pull request from turt2live/travis/general/number-to-int
Replace applicable types of 'number' to 'integer'
2018-08-28 07:40:28 -06:00
Valentin Deniaud 28ced3b0a4 fixup! document encrypted attachments 2018-08-28 15:04:40 +02:00
Travis Ralston efef3412a0 Take out the underscore restriction from state events
It's not needed anymore, and we should remove it while we're in the area.

Includes other misc changes to the schema layout.
2018-08-27 19:07:32 -06:00
Travis Ralston 439b9d2925 Power levels are also integers 2018-08-27 18:59:35 -06:00
Travis Ralston ee2ebe6792
Merge pull request from turt2live/travis/c2s/invite-room-state
Move `invite_room_state` to the correct place in the client-server API
2018-08-27 18:47:24 -06:00
Travis Ralston 4e885c3f77
Merge pull request from turt2live/travis/general/acls
Server ACLs
2018-08-27 17:48:43 -06:00
Matthew Hodgson 313e6de48b
tweak wording to spell out that handling legacy/noncompliant servers. 2018-08-27 23:36:48 +01:00
Travis Ralston 76afef79f8 Clarify the rationale and motive for blanket IP banning and port exclusion 2018-08-27 16:14:37 -06:00
Travis Ralston 82be6077ff Add a note that ACLs don't operate at the auth level; Fix glob definition 2018-08-27 16:13:42 -06:00
Travis Ralston be2e0fc9d4 Clarify that ACLs are required to manually deny unsupported hosts 2018-08-27 16:12:42 -06:00
Travis Ralston 72de8bec5c Remove unused algorithms for encrypted messages 2018-08-27 15:05:56 -06:00
Travis Ralston 438f5825ae Add more supported encryption algorithms to message events 2018-08-27 14:55:59 -06:00
Travis Ralston 55c0b968b5 Fix event schemas for /sync
This commit clarifies the required keys for each type of event that appears in sync, fixes the core event schema not declaring 'content' as required, and includes a mention that events may not have a room_id when appearing in /sync.

Fixes https://github.com/matrix-org/matrix-doc/issues/595
Fixes https://github.com/matrix-org/matrix-doc/issues/909
2018-08-26 22:22:36 -06:00
Travis Ralston 667fa082af Replace applicable types of 'number' to 'integer'
`number` implies/represents a float where `integer` does not.

The only remaining `type: number` in the project appear on power levels: those have been left untouched pending clarification.

Fixes https://github.com/matrix-org/matrix-doc/issues/746
2018-08-26 21:32:44 -06:00
Travis Ralston e9e93b0eec Move `invite_room_state` to the correct place in the client-server API
Fixes https://github.com/matrix-org/matrix-doc/issues/1350
2018-08-26 20:51:39 -06:00
Valentin Deniaud b7577ea237 document encrypted attachments
Fix .
2018-08-25 17:31:49 +02:00
Valentin Deniaud 579f5ea928 fixup! document key sharing and m.room_key_request 2018-08-25 17:26:40 +02:00
Valentin Deniaud 8ae137e82e fixup! document m.forwarded_room_key 2018-08-25 17:26:00 +02:00
Valentin Deniaud 768f33dc2d fixup! document key sharing and m.room_key_request 2018-08-25 16:55:28 +02:00
Valentin Deniaud 337316445f fixup! document m.forwarded_room_key 2018-08-25 16:55:00 +02:00
Travis Ralston ef41b5c2bf Server ACLs
Implements the proposal for https://github.com/matrix-org/matrix-doc/issues/1383
2018-08-22 12:48:37 -06:00
Valentin Deniaud 019c290fa2 document m.forwarded_room_key 2018-08-21 21:35:03 +02:00
Valentin Deniaud 2d8a321b46 document key sharing and m.room_key_request 2018-08-21 21:35:03 +02:00
Travis Ralston 3869f68a5c Merge remote-tracking branch 'matrix-org/master' into travis/general/room-versions 2018-08-21 12:22:35 -06:00
Valentin Deniaud f853856f21 add missing m.room.encrypted event properties 2018-08-18 11:41:45 +02:00
Valentin Deniaud 6c44233c42 require megolm algorithm in m.room.encryption 2018-08-18 11:41:45 +02:00
Valentin Deniaud 661176cb3a Olm m.room.encrypted example 2018-08-18 11:41:45 +02:00
Valentin Deniaud c60109d235 complete m.room_key documentation 2018-08-18 11:41:45 +02:00
Valentin Deniaud 3a8d13df60 add missing m.room.encryption properties 2018-08-18 11:41:45 +02:00