Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-09 09:23:43 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3222 commits 28 branches 42 tags 32 MiB
Commit graph

3222 commits

This branch
This branch
All branches
Author SHA1 Message Date
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.
 2018-08-30 11:57:01 -06:00
Travis Ralston 31ea4279d1 Resolve references in the check_examples script 2018-08-30 11:53:39 -06:00
Travis Ralston 6aacec3178 Fix power level JSON example 2018-08-30 11:40:08 -06:00
Travis Ralston 827033c128 Merge remote matrix-org/master 2018-08-30 11:29:47 -06:00
Travis Ralston 138419cdd4
fix indentation on release process doc 2018-08-30 11:19:55 -06:00
Travis Ralston 70f72b5b3b
Merge pull request #1628 from turt2live/travis/as/external_url 
Clarify how external_url is supposed to work
 2018-08-30 11:12:39 -06:00
Richard van der Hoff f649d04ae1
Merge pull request #1626 from matrix-org/rav/encoding 
Set the encoding to UTF-8 on all file I/O
 2018-08-30 18:11:38 +01:00
Travis Ralston cc1e496287
Merge pull request #1629 from turt2live/travis/as/route-versions 
Version all appservice endpoints and provide a fallback
 2018-08-30 11:11:25 -06:00
Richard van der Hoff 20c9829f56
Merge pull request #1627 from matrix-org/travis/general/dont-build-proposals 
Don't generate proposals.rst in Circle CI
 2018-08-30 18:10:48 +01:00
Travis Ralston 326ff6b1a1
Merge branch 'master' into travis/as/external_url 2018-08-30 11:09:15 -06:00
Travis Ralston 0f2e01f5b5
Merge pull request #1555 from turt2live/travis/as/cleanup 
Application service spec cleanup; Security definitions; r0 prep
 2018-08-30 11:08:10 -06:00
Travis Ralston 1a3f112337 Clarify that the external_url is unsafe 2018-08-30 11:07:09 -06:00
Travis Ralston be5c566028 Version all appservice endpoints and provide a fallback 
Fixes https://github.com/matrix-org/matrix-doc/issues/1616
 2018-08-30 11:03:42 -06:00
Travis Ralston a48f7b9278 Clarify how external_url is supposed to work 
Fixes https://github.com/matrix-org/matrix-doc/issues/1624
 2018-08-30 10:49:40 -06:00
Travis Ralston ecd3ce39e5 Don't generate proposals.rst in Circle CI 2018-08-30 10:38:23 -06:00
Travis Ralston 05b017276c Don't accidentally limit application services to one homeserver 2018-08-30 10:23:12 -06:00
Richard van der Hoff 4e90b32348 Set the encoding to UTF-8 on all file I/O 
Hopefully this will resolve issues with building the spec on systems where the
default encoding is somthing other than UTF-8.
 2018-08-30 17:18:07 +01:00
Travis Ralston ab14f33060 Add link to the client-server ACLs module 2018-08-30 10:11:37 -06:00
Travis Ralston 6b52e1df77
Merge pull request #1587 from turt2live/travis/s2s/clarify-state-ids-inclusion 
Clarify that the requested event is excluded from /state and /state_ids
 2018-08-30 07:44:27 -06:00
Travis Ralston 56f6640c07
Merge pull request #1618 from turt2live/travis/c2s/initalsync 
Remove references to initialSync from account data and receipts module
 2018-08-30 07:44:08 -06:00
Travis Ralston 7ecf2406eb
Merge pull request #1590 from turt2live/travis/c2s/403-put-state 
Document 403 error for sending state events
 2018-08-30 06:50:48 -06:00
Richard van der Hoff 6ba50fe2f6
Merge pull request #1588 from matrix-org/rav/fix_server_name 
Specify that server names cannot be %-encoded
 2018-08-30 10:48:06 +01:00
Travis Ralston 78487a01ec Remove references to initialSync from account data and receipts module 
Fixes https://github.com/matrix-org/matrix-doc/issues/695

Note: This commit leaves the /join endpoints alone because they say "and /sync" rather than just initialSync
 2018-08-29 23:11:00 -06:00
Travis Ralston b2092922e8 Don't define a variable for the appservice major version 2018-08-29 21:51:26 -06:00
Travis Ralston a5c3924492 Merge remote matrix-org/master 2018-08-29 21:28:24 -06:00
Travis Ralston fd7cb22a28 Fix event type example of m.forwarded_room_key 2018-08-29 21:22:47 -06:00
Hubert Chathi 4230e375fa
Merge pull request #1465 from Zil0/key_sharing 
Document key sharing events
 2018-08-29 23:05:17 -04:00
Hubert Chathi 0130620cc1
Merge pull request #1596 from uhoreg/e2e_sessions 
specify how to handle multiple olm sessions with the same device
 2018-08-29 22:45:38 -04:00
Travis Ralston a46783eb24 Revert "Take out the reference to the current version from the changelog" 
This reverts commit 2a20c11467.
 2018-08-29 18:10:03 -06:00
Travis Ralston 4c9d672e1f
Merge pull request #1521 from matrix-org/push_gateway/r0.1.0_updates 
r0.1.0 release of the Push Gateway specification
 2018-08-29 18:02:41 -06:00
Travis Ralston 2a20c11467 Take out the reference to the current version from the changelog 2018-08-29 17:54:48 -06:00
Travis Ralston 2ab2f91088 Merge remote-tracking branch 'matrix-org/master' into travis/releases/push-gateway/r0.1.0 2018-08-29 17:54:34 -06:00
Travis Ralston 684d80c422 Revert changes to 3pid lookup types in the IS spec 
The validator doesn't know what a "3PID Medium" is, for example, so it throws exceptions. This does reduce clarity in the spec though.
 2018-08-29 17:52:02 -06:00
Richard van der Hoff 196159be91 We should include the Host header if the port was explicit. 2018-08-29 22:18:14 +01:00
Travis Ralston abb91508be
Merge pull request #1556 from turt2live/travis/is/cleanup 
Identity Service API cleanup
 2018-08-29 15:16:53 -06:00
Travis Ralston a6d42bf140
Merge pull request #1176 from matrix-org/notifications/room 
spec notifications key on power level event and provide @room in example
 2018-08-29 14:19:51 -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
Matthew Hodgson 8e88d82a4b fix typo in anchor. fixes #1603 2018-08-29 19:15:05 +01:00
Travis Ralston e401b7255c
Merge pull request #1584 from turt2live/travis/general/state-key-restriction 
Update schemas and auth rules to cover the @ state key restriction
 2018-08-29 10:35:35 -06:00
Travis Ralston 90fe395aeb Take out the @ state_key restriction from the auth rules 
This is being handled in https://github.com/matrix-org/matrix-doc/pull/1591
 2018-08-29 10:26:02 -06:00
Travis Ralston 73feee5d73
Merge pull request #1586 from turt2live/travis/as/comment-ts-section 
Comment out the timestamp massaging section for now
 2018-08-29 10:10:36 -06:00
Travis Ralston 25b34e1d7b Mention that ts massaging was in a draft, but not in the release 2018-08-29 09:55:43 -06:00
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
 2018-08-29 09:32:14 -06:00
Travis Ralston 39ef845a53
Merge pull request #1547 from turt2live/travis/c2s/pills 
Document how mentions (pills) work
 2018-08-29 09:13:02 -06:00
Travis Ralston 5ff244f06b More clarification about how /state_ids works 2018-08-29 09:00:46 -06:00
Travis Ralston de36d97839 Clarify which event is actually be excluded from /state_ids 2018-08-29 08:53:20 -06:00
Hubert Chathi 5019fb7c49
Merge pull request #1359 from uhoreg/well-known 
.well-known discovery
 2018-08-29 10:40:54 -04:00
Hubert Chathi 9d0fec3645 add changelog 2018-08-29 10:25:24 -04:00
Hubert Chathi 688c8ebcd3 specify how to handle multiple olm sessions with the same device 2018-08-29 10:17:20 -04:00