Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-26 02:48:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3101 commits 30 branches 42 tags 32 MiB
Commit graph

3101 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston 4278a9a516 Merge remote-tracking branch 'matrix-org/master' into travis/c2s/fix-events 2018-08-27 19:17:37 -06:00
Travis Ralston e4f8c23972
Merge pull request #1562 from turt2live/travis/c2s/html-formatting 
Define the supported HTML subset for message events
 2018-08-27 19:14:52 -06:00
Travis Ralston f9c7014a65
Merge pull request #1577 from turt2live/travis/c2s/search-filter 
Specify the type of filter the search API expects
 2018-08-27 19:09:19 -06:00
Travis Ralston 03065b0584
Merge pull request #1572 from turt2live/travis/c2s/sync-left-account-data 
Add `account_data` to left rooms in /sync
 2018-08-27 18:59:58 -06:00
Travis Ralston 9527ce31f5
Merge pull request #1570 from turt2live/travis/c2s/sync-filtering 
Update filtering API documentation
 2018-08-27 18:51:00 -06:00
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 7b7933327a Changelog 2018-08-27 15:57:51 -06:00
Travis Ralston 5fa6b49365 Specify the type of filter the search API expects 
Note: This is badly named until https://github.com/matrix-org/matrix-doc/pull/1570 lands

Fixes https://github.com/matrix-org/matrix-doc/issues/598
 2018-08-27 15:56:47 -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 89daa3c5ce Clarify that clients aren't required to render all the tags 
This commit also includes minor clarifications to surrounding text.
 2018-08-27 09:17:40 -06:00
Travis Ralston 5bf99aeb34 Add a note that formatted_body is not forever 2018-08-27 09:17:08 -06:00
Travis Ralston c7822cc9a8 Link to the content repo when referencing MXC URIs in images 2018-08-27 09:16:53 -06:00
Travis Ralston d7d28f7e5b Remove nl as a supported HTML tag 2018-08-27 09:16:30 -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 e8edfba114 Changelog 2018-08-26 21:57:04 -06:00
Travis Ralston 008ebb8c1a Add account_data to left rooms in /sync 
Fixes https://github.com/matrix-org/matrix-doc/issues/1392
 2018-08-26 21:55:30 -06:00
Travis Ralston b0fbd7be7c Changelog 2018-08-26 21:24:33 -06:00
Travis Ralston b68ed5d594 Define the default for the contains_url filter param 
Fixes https://github.com/matrix-org/matrix-doc/issues/1553
 2018-08-26 21:21:49 -06:00
Travis Ralston 1cbcaba2c7 Clean up examples in filter.yaml 
Indentation, excess examples.
 2018-08-26 21:21:27 -06:00
Travis Ralston 26a7a341f0 Mark the filter_id in the response of POST /filter as required 2018-08-26 21:21:02 -06:00
Travis Ralston 97e3dd443b Update room_event_filter.yaml to use the OpenAPI allOf definition 
This is just maintenance.
 2018-08-26 21:20:01 -06:00
Travis Ralston 7d08ef73d0 Fix naming of the Filter schemas 
EventFilter !== Filter

Fixes https://github.com/matrix-org/matrix-doc/issues/1509
 2018-08-26 21:19:07 -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 e5a7dd1c45 Remove excess commas from JSON 2018-08-25 23:00:26 -06:00
Travis Ralston 3c472f70e3 Changelog 2018-08-25 22:59:22 -06:00
Travis Ralston aa294fac06 Define the supported HTML subset for message events 
Also clarify that `m.notice` messages can support HTML.

Fixes https://github.com/matrix-org/matrix-doc/issues/1559
Fixes https://github.com/matrix-org/matrix-doc/issues/1560
 2018-08-25 22:57:52 -06:00
Travis Ralston 295b1322e2 Add back the unsigned.age property to voip event examples 2018-08-25 22:26:23 -06:00