4b05194a91
Fix bad merge
6 years ago
4278a9a516
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/fix-events
6 years ago
e4f8c23972
Merge pull request #1562 from turt2live/travis/c2s/html-formatting
...
Define the supported HTML subset for message events
6 years ago
f9c7014a65
Merge pull request #1577 from turt2live/travis/c2s/search-filter
...
Specify the type of filter the search API expects
6 years ago
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
03065b0584
Merge pull request #1572 from turt2live/travis/c2s/sync-left-account-data
...
Add `account_data` to left rooms in /sync
6 years ago
439b9d2925
Power levels are also integers
6 years ago
f2332d242a
Add some SHOULDs and MUSTs to the user directory requirements
6 years ago
bb515d15a4
Clarify which collation to use for user directory searching
6 years ago
9527ce31f5
Merge pull request #1570 from turt2live/travis/c2s/sync-filtering
...
Update filtering API documentation
6 years ago
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
39e674ccb3
Clarify what matrix.to is and mention that room IDs are not routable
...
Also actually render the warning saying that this scheme is temporary.
6 years ago
fa3e9a7609
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/pills
6 years ago
6f80db5ddf
Include the "other versions" section of the changelog
6 years ago
07153c22a9
Misc. cleanup of the appservice spec
6 years ago
f01cfa2c7b
Add security definitions to hs->as endpoints
6 years ago
fa96d8629b
Prepare the appservice spec for an r0 release
...
This puts the scaffolding in place for an r0 release to happen, such as the changelog and version variables.
6 years ago
bba76c23d2
Merge pull request #1552 from turt2live/travis/as/normal-events
...
Specify that application services receive events in the CSAPI format
6 years ago
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.
6 years ago
51193cac39
Merge remote-tracking branch 'matrix-org/master' into travis/as/normal-events
6 years ago
87133d8505
Merge pull request #1574 from turt2live/travis/c2s/fix-directory-put
...
Clean up PUT /directory/room
6 years ago
4e885c3f77
Merge pull request #1550 from turt2live/travis/general/acls
...
Server ACLs
6 years ago
a0b17e6ed6
Merge pull request #1551 from turt2live/travis/c2s/push-rules
...
General improvements to the push rules module
6 years ago
090f852fdf
Merge pull request #1262 from matrix-org/anoa/document_as_options
...
Document new application service registration file options
6 years ago
97508d5dc5
Merge pull request #1554 from turt2live/travis/general/appservice-directories
...
Application service room directories (and other third party network things)
6 years ago
54032964fc
Misc clarity for 3rd party appservice protocols/locations
6 years ago
32ac81c588
Spelling
6 years ago
bac0392a2d
General clarity for push rule defaults and where to get information
...
Include moving a roaming condition that was under the wrong rule.
6 years ago
313e6de48b
tweak wording to spell out that handling legacy/noncompliant servers.
6 years ago
d7397ccd56
Provide additional rationale for kicking users when they are ACLd
6 years ago
76afef79f8
Clarify the rationale and motive for blanket IP banning and port exclusion
6 years ago
82be6077ff
Add a note that ACLs don't operate at the auth level; Fix glob definition
6 years ago
be2e0fc9d4
Clarify that ACLs are required to manually deny unsupported hosts
6 years ago
7b7933327a
Changelog
6 years ago
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
6 years ago
d6b0cad9b8
Merge pull request #1563 from turt2live/travis/general/fix-build-1
...
Ensure the event examples and matrix.org assets are tested
6 years ago
72de8bec5c
Remove unused algorithms for encrypted messages
6 years ago
438f5825ae
Add more supported encryption algorithms to message events
6 years ago
17bdc0c740
Revert "Fix encrypted event examples"
...
This reverts commit be9f6042e5
6 years ago
be97e95dc1
Promote device management to be a dedicated section
6 years ago
8069981252
Add federation /user/* endpoints
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1438
6 years ago
89daa3c5ce
Clarify that clients aren't required to render all the tags
...
This commit also includes minor clarifications to surrounding text.
6 years ago
5bf99aeb34
Add a note that formatted_body is not forever
6 years ago
c7822cc9a8
Link to the content repo when referencing MXC URIs in images
6 years ago
d7d28f7e5b
Remove nl as a supported HTML tag
6 years ago
ce0befd7d0
Changelog
6 years ago
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).
6 years ago
fd47184ce3
Changelog
6 years ago
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
6 years ago
e8edfba114
Changelog
6 years ago
Travis Ralston