Commit Graph

274 Commits (de725c26ccebe93faf556305f4803215f0aab50d)

Author SHA1 Message Date
Travis Ralston 1f86e8e31b Refactor documentation for content/media repository
Fixes https://github.com/matrix-org/matrix-doc/issues/2060
Fixes https://github.com/matrix-org/matrix-doc/issues/772
Fixes https://github.com/matrix-org/matrix-doc/issues/888
6 years ago
Travis Ralston d7f37f92eb Merge branch 'master' into travis/1.0/fix-examples 6 years ago
Travis Ralston 464845feb0 Make url required for m.file-like messages
Fixes https://github.com/matrix-org/matrix-doc/issues/2008

This also removes `filename` from `m.file` because it has never been used in practice.
6 years ago
Travis Ralston d6d74c4cbe Switch to using $ instead of # for sub-types
# is reserved by the swagger validator as a way to include partial content from a JSON object (eg: "#/path" would include {"test": true} from the object {"path":{"test":true}}). Instead of trying to convince the validator that it is wrong, we'll just use a different character.

Note that our rendering tools do not care about #-style references to objects. It's still somewhat worth changing the character though.
6 years ago
Travis Ralston 2cf00fc5ca
Merge pull request #2031 from matrix-org/travis/1.0/voip-hangup
Add missing reason property to m.call.hangup
6 years ago
Travis Ralston 229893589a Move wording for reason definitions 6 years ago
Travis Ralston 00f97636a2 Add missing reason property to m.call.hangup
Fixes https://github.com/matrix-org/matrix-doc/issues/1689
6 years ago
Travis Ralston 5eea4a477f Add server notices support
As per [MSC1452](https://github.com/matrix-org/matrix-doc/issues/1452) 

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

Although MSC1452 focuses on just the warnings part of the server notices, the base for notices has not been established in the spec. This commit adds the needed support to be able to handle notices.

No intentional divergences from the proposal are included in this changeset. There are a few additions which are used in practice although not defined in the proposal, such as who is responsible for aesthetics, sending notices, and other misc rules.
6 years ago
Jonas Platte 043dddc490
Fix a typo in m.call.invite 6 years ago
Anatoly Sablin 4bec3d6dd8 Avoid duplicates. 6 years ago
Anatoly Sablin d4b4d92b82 Fix the m.push_rules type (switch from the state event to the common event). 6 years ago
Anatoly Sablin 2de7ef9a3d #1865 Add the m.push_rules schema. 6 years ago
Travis Ralston b85f7bb248 Add room version upgrades
Implements https://github.com/matrix-org/matrix-doc/issues/1501
6 years ago
Travis Ralston 1268b421ec
Update the m.presence schema to include status_msg 6 years ago
Travis Ralston f78bb72be8
Add status_msg to m.presence example 6 years ago
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
6 years ago
Konstantinos Sideris 192a6c2ab9 Use example.org on examples instead of domain.com which is a real domain
Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
6 years ago
Travis Ralston 108c623557
Merge pull request #1635 from turt2live/travis/c2s/read-markers
Add read markers
6 years ago
Hubert Chathi c0dd7e0025
Merge pull request #1420 from Zil0/encrypted_attach
Document encrypted attachments
6 years ago
Hubert Chathi f1f32d3a15 add more clarifications 6 years ago
Travis Ralston 679ddabb53 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers 6 years ago
Hubert Chathi e3daf10bb9 refactor encrypted file schema as "Extension to m.message" 6 years ago
Travis Ralston fc037b3a72 Fix merge 6 years ago
Travis Ralston 2e3e189ea2 Merge remote matrix-org/master 6 years ago
Travis Ralston afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags
Update the room tagging documentation
6 years ago
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)
6 years ago
Travis Ralston 429f302744 Add an `age` to the invite room state example 6 years ago
Travis Ralston 464f4f5f21 Correctly check for the 'core' folder 6 years ago
Travis Ralston c8a8f13623 Don't check the underlying definitions
Otherwise the script will try to find a schema for our templates, which don't exist.
6 years ago
Travis Ralston 31ea4279d1 Resolve references in the check_examples script 6 years ago
Travis Ralston 6aacec3178 Fix power level JSON example 6 years ago
Travis Ralston 827033c128 Merge remote matrix-org/master 6 years ago
Travis Ralston fd7cb22a28 Fix event type example of m.forwarded_room_key 6 years ago
Hubert Chathi 4230e375fa
Merge pull request #1465 from Zil0/key_sharing
Document key sharing events
6 years ago
Travis Ralston c03f2f8d79 Minor touchups to the room tagging API
Fixes some of https://github.com/matrix-org/matrix-doc/issues/1565
6 years ago
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>
6 years ago
Travis Ralston c83da453b5 s/number/integer 6 years ago
Travis Ralston 26d5a24b88 Merge remote matrix-org/master 6 years ago
Travis Ralston 62b1b8b660 Have unsigned.age appear on all room events
This is useful for a lot of things, like bridges (appservices), VoIP handling, and clients which generally may wish to do something with the field. Might as well include it on every event, despite the recommendation of https://github.com/matrix-org/matrix-doc/issues/1524
6 years ago
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.
6 years ago
Travis Ralston ee3b0f42db Fix server ACL schema: The type is a string
It cannot be an enum otherwise the build starts screaming.
6 years ago
Travis Ralston 6cdb463829
Merge pull request #1571 from turt2live/travis/general/number-to-int
Replace applicable types of 'number' to 'integer'
6 years ago
Valentin Deniaud 28ced3b0a4 fixup! document encrypted attachments 6 years ago
Travis Ralston 8e42f3ab3a Fix bad merge on brackets 6 years ago
Travis Ralston 4b05194a91 Fix bad merge 6 years ago
Travis Ralston 4278a9a516 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/fix-events 6 years ago
Travis Ralston e4f8c23972
Merge pull request #1562 from turt2live/travis/c2s/html-formatting
Define the supported HTML subset for message events
6 years ago
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.
6 years ago
Travis Ralston 439b9d2925 Power levels are also integers 6 years ago
Travis Ralston ee2ebe6792
Merge pull request #1568 from turt2live/travis/c2s/invite-room-state
Move `invite_room_state` to the correct place in the client-server API
6 years ago