Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-20 16:38:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
4200 commits 29 branches 42 tags 32 MiB
Commit graph

4200 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston db8d118ceb Merge branch 'master' into client_server/release-r0.5.0 2019-06-11 11:31:39 -06:00
Travis Ralston 19a3d574b7 Fix HKDF rationale 2019-06-11 11:31:24 -06:00
Travis Ralston ba5479e46f Reference Canonical JSON 2019-06-11 11:30:04 -06:00
Travis Ralston 8f1f8b4fe5 Fix references to filtering 
We can't have two different backlinks for the same text, so use LL as the label
 2019-06-11 11:28:35 -06:00
Travis Ralston 98c9d93b20
Merge pull request #2113 from matrix-org/client_server/release-r0.5.0 
Client-Server r0.5.0
 2019-06-11 10:54:06 -06:00
Travis Ralston 497c6875ac
Merge pull request #2112 from matrix-org/server_server/release-r0.1.2 
Federation r0.1.2
 2019-06-11 10:53:56 -06:00
Travis Ralston 67d12165e8
Merge pull request #2111 from matrix-org/identity_service/release-r0.2.0 
Identity r0.2.0
 2019-06-11 10:53:44 -06:00
Travis Ralston 1e9308cbc9
Merge pull request #2109 from matrix-org/application_service/release-r0.1.1 
Appservice r0.1.1
 2019-06-11 10:41:40 -06:00
Travis Ralston 1ca60bf5d7 Client-Server r0.5.0 2019-06-11 10:40:48 -06:00
Travis Ralston 8e6ccf0a0e Federation r0.1.2 2019-06-11 10:38:12 -06:00
Travis Ralston 34ad81e81b Identity r0.2.0 2019-06-11 10:30:56 -06:00
Travis Ralston 4f915f2760 Appservice r0.1.1 2019-06-11 10:15:51 -06:00
Travis Ralston f44483a8cf
Merge pull request #2099 from matrix-org/travis/1.0/1.0-notice 
Declare Matrix 1.0 in the index
 2019-06-11 09:56:55 -06:00
Travis Ralston 2d18f81807
Merge pull request #2087 from matrix-org/travis/1.0/events-are-extensible 
Reorganize event structure in c2s spec and clarify event capabilities
 2019-06-11 09:55:17 -06:00
Travis Ralston c9345ba6a3 Never forget the past 2019-06-11 09:53:36 -06:00
Travis Ralston 8ac555f870
Merge pull request #2083 from matrix-org/travis/1.0/key-object 
Clarify the key object definition for the key management API
 2019-06-11 09:50:34 -06:00
Travis Ralston 8b7887dfc2 Link to key algorithms section 2019-06-11 09:47:02 -06:00
Travis Ralston 19f017f9bd
Merge pull request #2035 from matrix-org/travis/1.0/msc688-msc1227-lazy-loading 
Spec lazy-loading room members
 2019-06-11 09:39:32 -06:00
Travis Ralston fbdb56a29f
Merge pull request #2101 from matrix-org/anoa/hs_3pid_tokens 
Add submit_url field to requestToken responses, clarify HS's can send tokens themselves
 2019-06-11 09:25:53 -06:00
Travis Ralston 56745c76aa Clarify that submit_url being not present only matters for r0.5 2019-06-11 09:22:02 -06:00
Travis Ralston 85f34f942f Fix invalid doc error 
Another annoying case of Swagger fighting us
 2019-06-11 09:18:29 -06:00
Travis Ralston f7aa2adfb4 Fix indentation 2019-06-11 09:16:44 -06:00
Travis Ralston 6d60258e25
Merge pull request #2080 from matrix-org/travis/1.0/msc2076-msc2077-v5-rooms 
Spec v5 rooms: Key validity
 2019-06-11 08:51:25 -06:00
Travis Ralston b32f0e768f clarify that UIA can now be done by the HS 2019-06-11 08:47:40 -06:00
Travis Ralston ca8b539b2f humans prefer to be treated as people 2019-06-11 08:47:25 -06:00
Travis Ralston 370ae8b9fe
Merge pull request #2068 from matrix-org/travis/1.0/mxc 
Refactor documentation for content/media repository
 2019-06-11 08:32:06 -06:00
Travis Ralston 04930c6ddf Don't enforce MXC URIs, but also don't confuse people 2019-06-11 08:29:50 -06:00
Travis Ralston ad3aa5edf0
Merge pull request #2104 from matrix-org/travis/1.0/event-ids 
Clarify that the common identifier format can be broken
 2019-06-11 07:51:34 -06:00
Travis Ralston b7378a860a
Merge pull request #2097 from matrix-org/travis/1.0/common-themes 
Specify some of the common concepts for Matrix in the index
 2019-06-11 07:51:06 -06:00
Travis Ralston c1c26859e2
Merge pull request #2096 from matrix-org/travis/1.0/read-notifs 
Clarify how notification counts are calculated in /sync
 2019-06-11 07:50:33 -06:00
Travis Ralston 39b79fe453
Merge pull request #2088 from matrix-org/travis/1.0/duplicate-state-endpoint 
Merge GET/PUT /state/:event_type endpoints
 2019-06-11 07:49:20 -06:00
Andrew Morgan 5f24f63338 Better wording 2019-06-10 19:21:14 -04:00
Andrew Morgan 1a22508e15 identity server -> the server 2019-06-10 19:18:58 -04:00
Andrew Morgan 572d29348c
Update changelogs/client_server/newsfragments/2101.breaking 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-06-11 00:18:37 +01:00
Travis Ralston fc1d8f184d
Merge pull request #2078 from matrix-org/anoa/msc2078 
MSC2078: Sending Third-Party Request Tokens via the Homeserver
 2019-06-10 14:25:35 -06:00
Travis Ralston ad2eefdde9 Shuffle and clarify identifier grammar 
Specifically, make it clearer that event IDs are the weird exception in this section.
 2019-06-10 14:23:04 -06:00
Travis Ralston 32761fc108
Merge pull request #2098 from matrix-org/travis/1.0/modules-update 
Clarify what a "module" is and update feature profiles for clients
 2019-06-10 14:05:15 -06:00
Travis Ralston 37e2d81d58 Hardcode the state event fields table into the spec 
See comment for why.
 2019-06-10 14:04:27 -06:00
Travis Ralston 51698a5dd5 Clarify that people must own the namespace to use it 2019-06-10 14:04:14 -06:00
Travis Ralston 19c827e581 Remove trailing slashes section 2019-06-10 13:49:05 -06:00
Travis Ralston 49831fb74f Clarifications about namespaces 2019-06-10 13:48:55 -06:00
Travis Ralston 1886a2346a Move explanation of notifications to notifications module 2019-06-10 13:38:43 -06:00
Travis Ralston cf19f52576 Enforce 7 day validity requirement everywhere 
also misc formatting fixes
 2019-06-10 13:21:24 -06:00
Travis Ralston 56e1640bea
Merge pull request #2106 from matrix-org/matthew/1.0/msc688-msc1227-lazy-loading 
incorporate LL review from matthew
 2019-06-10 13:02:09 -06:00
Matthew Hodgson 0506d09cf7 incorporate LL review from matthew 2019-06-10 19:38:44 +01:00
Travis Ralston 36659ca266
Merge pull request #2091 from matrix-org/travis/1.0/mxid-register 
Clarify that /register must produce valid Matrix User IDs
 2019-06-10 11:08:41 -06:00
Travis Ralston f047e235df Merge branch 'master' into travis/1.0/event-ids 2019-06-10 10:52:34 -06:00
Travis Ralston 65c3935419
Merge pull request #2076 from matrix-org/rav/proposal/enforce_key_validity_periods 
MSC2076: Enforce key-validity periods when validating event signatures
 2019-06-10 07:25:09 -06:00
Travis Ralston 19575eb4d4
Merge pull request #2077 from matrix-org/rav/proposal/room_v5 
MSC2077: room v5
 2019-06-10 07:24:41 -06:00
Travis Ralston 6d62a1b444
Merge pull request #2084 from matrix-org/travis/1.0/s2s-swagger-touchups 
Touchups on the s2s swagger definitions
 2019-06-10 07:22:24 -06:00