Commit graph

3076 commits

Author SHA1 Message Date
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
2018-08-27 18:47:24 -06:00
Travis Ralston
bba76c23d2
Merge pull request #1552 from turt2live/travis/as/normal-events
Specify that application services receive events in the CSAPI format
2018-08-27 18:00:25 -06:00
Travis Ralston
17e0ef4b91 Remove empty file and now-empty section from the appservice spec
This commit has approval under https://github.com/matrix-org/matrix-doc/pull/1555 although is being included in this branch/PR so the build passes, permitting a merge.
2018-08-27 17:58:47 -06:00
Travis Ralston
51193cac39 Merge remote-tracking branch 'matrix-org/master' into travis/as/normal-events 2018-08-27 17:53:32 -06:00
Travis Ralston
87133d8505
Merge pull request #1574 from turt2live/travis/c2s/fix-directory-put
Clean up PUT /directory/room
2018-08-27 17:49:05 -06:00
Travis Ralston
4e885c3f77
Merge pull request #1550 from turt2live/travis/general/acls
Server ACLs
2018-08-27 17:48:43 -06:00
Travis Ralston
a0b17e6ed6
Merge pull request #1551 from turt2live/travis/c2s/push-rules
General improvements to the push rules module
2018-08-27 17:48:01 -06:00
Travis Ralston
090f852fdf
Merge pull request #1262 from matrix-org/anoa/document_as_options
Document new application service registration file options
2018-08-27 17:47:53 -06:00
Travis Ralston
97508d5dc5
Merge pull request #1554 from turt2live/travis/general/appservice-directories
Application service room directories (and other third party network things)
2018-08-27 17:47:34 -06:00
Travis Ralston
54032964fc Misc clarity for 3rd party appservice protocols/locations 2018-08-27 17:41:52 -06:00
Travis Ralston
32ac81c588 Spelling 2018-08-27 17:41:27 -06:00
Travis Ralston
bac0392a2d General clarity for push rule defaults and where to get information
Include moving a roaming condition that was under the wrong rule.
2018-08-27 17:28:08 -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
d7397ccd56 Provide additional rationale for kicking users when they are ACLd 2018-08-27 16:21:10 -06: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
d6b0cad9b8
Merge pull request #1563 from turt2live/travis/general/fix-build-1
Ensure the event examples and matrix.org assets are tested
2018-08-27 15:15:06 -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
17bdc0c740 Revert "Fix encrypted event examples"
This reverts commit be9f6042e5.
2018-08-27 14:51:34 -06:00
Travis Ralston
ce0befd7d0 Changelog 2018-08-26 22:28:52 -06:00
Travis Ralston
e60b44e27f Clean up PUT /directory/room
Fixes https://github.com/matrix-org/matrix-doc/issues/933

The issue references two problems: a `roomInfo` and lack of a `room_id`. It appears the `room_id` has been fixed since reporting, however the `roomInfo` remained (and is now fixed).
2018-08-26 22:27:34 -06:00
Travis Ralston
5ceb132110 Changelog 2018-08-26 20:52:59 -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
Travis Ralston
be9f6042e5 Fix encrypted event examples 2018-08-25 23:24:02 -06:00
Travis Ralston
0a6c1c4dda Ensure the event examples and matrix.org assets are tested
Otherwise we go nearly a week without realizing the build is failing due to bad schemas/examples. This also helps us ensure a PR is up to par.

This commit is expected to cause a build failure at this time. A future commit will actually fix the project and address concerns raised by the testing.
2018-08-25 23:19:24 -06:00
Travis Ralston
32ce676eb6
Merge pull request #1561 from QMatrixClient/kitsune-fix-type-in-openid
openid.yaml: int is not a valid Swagger type
2018-08-25 09:48:59 -06:00
Kitsune Ral
c879eb950f client-server/openid.yaml: Fix a type'o
Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
2018-08-25 22:49:12 +09:00
Travis Ralston
9b19fc27de changelog 2018-08-24 11:09:55 -06:00
Travis Ralston
017d6db737 Document third party network/protocol directories (for appservices)
Fixes https://github.com/matrix-org/matrix-doc/issues/869
2018-08-24 11:07:30 -06:00
Travis Ralston
2d43ff1234 Update third party network schemas
Some information was missed when this was reviewed. This commit adds some additional documentation for how these objects interact with each other.
2018-08-24 10:48:47 -06:00
Travis Ralston
9eda1a6971 Move the third party network API to it's own section 2018-08-24 10:22:19 -06:00
Travis Ralston
5f06694b6f
Merge pull request #1516 from turt2live/travis/general/room-versions
Specify how room versioning works
2018-08-24 08:34:59 -06:00
Travis Ralston
6a91ea9c85 Specify that application services receive events in the CSAPI format
Fixes https://github.com/matrix-org/matrix-doc/issues/1269

This is also supposed to fix the 'age' problem, however that is a larger problem with the event schemas that is reserved for a future PR/commit.
Reference: https://github.com/matrix-org/matrix-doc/issues/1294
Reference: https://github.com/matrix-org/matrix-doc/issues/1524
2018-08-23 13:31:33 -06:00
Travis Ralston
bbd33c1461 Move appservice transaction API to the right section
Part of https://github.com/matrix-org/matrix-doc/issues/1532
2018-08-23 13:29:04 -06:00
Travis Ralston
a95d7092eb Changelog 2018-08-22 15:27:48 -06:00
Travis Ralston
bce324818b Changelog 2018-08-22 15:26:27 -06:00
Travis Ralston
ab0be04571 Fix titles 2018-08-22 15:24:53 -06:00
Travis Ralston
7ec3cc4343 General improvements to the push rules module
This commit does a few things:
* Add 3 undocumented push rules to the spec for encrypted events and at-room notifications.
* Require unrecognized conditions to not match, ensuring that future conditions do not cause clients to accidentally notify users.
* Clarify that push rules should be enabled when created.
* Document a new condition required for at-room notifications.

Fixes https://github.com/matrix-org/matrix-doc/issues/1163
Fixes https://github.com/matrix-org/matrix-doc/issues/1034
Fixes https://github.com/matrix-org/matrix-doc/issues/676
Fixes https://github.com/matrix-org/matrix-doc/issues/1033
Relates to https://github.com/matrix-org/matrix-doc/issues/1101
2018-08-22 15:21:21 -06: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
Travis Ralston
3869f68a5c Merge remote-tracking branch 'matrix-org/master' into travis/general/room-versions 2018-08-21 12:22:35 -06:00
Travis Ralston
6172d5986a
Merge pull request #1537 from turt2live/travis/as/user-alias-query
Clean up user and alias querying for application services
2018-08-21 12:14:07 -06:00
Travis Ralston
997562786b
Merge pull request #1534 from turt2live/travis/as/auth-impersonation
Encourage appservices to use the Authorization header
2018-08-21 12:13:35 -06:00
Travis Ralston
1102fc59b2 Spelling 2018-08-21 12:13:19 -06:00
Travis Ralston
389fa87e6e English 2018-08-21 12:10:40 -06:00
Travis Ralston
e4f5c3d55e
Merge pull request #1518 from turt2live/travis/c2s/create-room-improvements
Add general clarity to the /createRoom endpoint
2018-08-21 12:04:56 -06:00
Travis Ralston
1d7ea314d4
Merge pull request #1482 from turt2live/travis/s2s/presence
Document how presence EDUs work between servers
2018-08-21 11:26:32 -06:00
Travis Ralston
339a2748e8 Take out groups for now; Move namespace mention
Groups aren't landing in the spec yet, so we shouldn't include them yet.
2018-08-21 09:49:41 -06:00
Travis Ralston
a9aa2ada47
Merge pull request #1546 from turt2live/travis/s2s/depth-bandaid
Document the maximum value for depth
2018-08-21 09:47:54 -06:00