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

4410 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luca Becker 15994c61a5
Clarification regarding authorisation rules 
The rules for m.room.power_levels power were somewhat unclear regarding the behaviour towards the always present keys, such as kick and ban. Additionally, it is now also clarified that in the users and events dictionary also added and removed keys are taken into consideration.
 2019-07-16 17:33:13 +02:00
Sorunome 9ebcff5758
fix typo, add section on html details element 2019-07-16 17:11:07 +02:00
Andrew Morgan 36cb8ed894 none -> m.none 2019-07-16 10:44:02 +01:00
Sorunome 1f786ae6dc
commit image into repo, fix typo 2019-07-15 20:52:24 +02:00
Richard van der Hoff b09d48a9f7 Spec link 2019-07-14 20:22:39 +01:00
Richard van der Hoff 78d46b2890 Proposal to move the redacts key to a sane place 2019-07-14 20:20:09 +01:00
Andrew Morgan 3514437d24 Ability for client/server to decide on no hashing 2019-07-12 11:37:41 +01:00
Travis Ralston 7b0f5ea77b
Merge pull request #2159 from jimmycuadra/reference-hash-purpose 
Clarify the purpose of reference hashes.
 2019-07-09 16:27:44 -06:00
Jimmy Cuadra a3d2d14dae Rephrase explanation of the purpose of reference hashes and link to the 
room version spec.

Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
 2019-07-09 15:26:03 -07:00
Andrew Morgan 52643a92c6
Less confusing wording on Application Service's Legacy Routes (#2160) 
https://matrix.org/docs/spec/application_service/r0.1.1#legacy-routes

The "becomes" wording made it a little bit confusing for which was the new route and which was the old.
 2019-07-09 17:54:45 +01:00
Jimmy Cuadra 5df86dabe0 Clarify the purpose of reference hashes. 
The server-server specification describes a "reference hash" of an event
and how to calculate it, but is otherwise not mentioned anywhere else in
the document. This change adds a sentence to explain that they are used
for event identifiers in later room versions, which are described in
other documents.

Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
 2019-07-09 01:14:29 -07:00
Hubert Chathi ee04b778cf
Merge pull request #2157 from a-andreyev/aa13q/api-client-server-device-keys 
Client-server: Fix upload keys example request
 2019-07-08 15:57:56 -04:00
Alexey Andreyev 9ed19a37ad
Client-server: Fix upload keys example request 
Contributes to #1733

Signed-off-by: Alexey Andreyev <aa13q@ya.ru>
 2019-07-08 22:28:32 +03:00
Andrew Morgan ed67e26037 pepper must not be an empty string, append medium 2019-07-08 17:03:20 +01:00
Andrew Morgan 1963a24832 fix attacks paragraph 2019-07-08 13:27:38 +01:00
Andrew Morgan dd8a6549c9 Address review comments 2019-07-08 11:55:37 +01:00
Andrew Morgan 3702669424 update from comments 2019-07-05 15:59:29 +01:00
Andrew Morgan f4a1e02884 simple method once more 2019-07-04 16:28:49 +01:00
Travis Ralston db5ce0c69e
Merge pull request #2152 from matrix-org/jryans/room-one-to-one-push-rule 
Clarify `.m.rule.room_one_to_one` push rule
 2019-07-03 09:35:12 -06:00
J. Ryan Stinnett 9208c5cd13 Add changelog 2019-07-03 11:34:00 +01:00
J. Ryan Stinnett 4c65660b96 Clarify .m.rule.room_one_to_one push rule 
This clarifies the `.m.rule.room_one_to_one` push rule by adding a condition on
event type. Some parts of the spec already had this info, while others were
missing it. Synapse has had this behaviour since the push rule appeared.

Fixes https://github.com/matrix-org/matrix-doc/issues/2150
 2019-07-03 10:59:38 +01:00
reivilibre 8033ab1c86 Fix Push Gateway API example: Field renamed to event_id 
I believe this was forgotten in:
71cb646541
 2019-07-03 10:36:16 +01:00
Andrew Morgan 53bd384f2e Clarify salting 2019-07-03 09:59:38 +01:00
Andrew Morgan 922a20ba26 small fixes 2019-07-01 16:30:07 +01:00
Andrew Morgan 6f81d3774b New hashing method 2019-07-01 16:23:28 +01:00
Travis Ralston 8897ea4bb1 Merge branch 'master' into travis/msc/integrations/discovery 2019-06-27 21:56:23 -06:00
Travis Ralston a2a7b7ff13 Merge branch 'master' into travis/msc/integrations/auth 2019-06-27 21:55:59 -06:00
Travis Ralston bfd8e52c23 Formatting 2019-06-27 20:45:23 -06:00
Travis Ralston d8283b9cdf Add option to use query string 2019-06-27 20:44:49 -06:00
Travis Ralston e80753e56c Add .well-known discovery 2019-06-27 18:24:42 -06:00
Sorunome 540aab82a1
accidentally formatted the wrong entry 2019-06-27 13:09:15 +02:00
Sorunome 6260871a21
spoiler fallback to uploaded media 2019-06-27 13:07:08 +02:00
Andrew Morgan 7549c5dd76 Merge branch 'hs/hash-identity' of github.com:matrix-org/matrix-doc into hs/hash-identity 2019-06-26 10:57:07 +01:00
Andrew Morgan 0fd4fe2542 Add algo/pepper to err resp 2019-06-26 10:55:44 +01:00
Andrew Morgan dfb37fcce1 update with feedback 2019-06-25 18:55:18 +01:00
Andrew Morgan df88b13ce1
Update proposals/2134-identity-hash-lookup.md 
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
 2019-06-25 18:15:02 +01:00
Travis Ralston ad5d46d331
Merge pull request #2148 from matrix-org/anoa/typooo 
Fix a small typo
 2019-06-25 10:08:06 -06:00
Andrew Morgan e88a074c9f Add changelog 2019-06-25 17:02:39 +01:00
Andrew Morgan 4997abc4b7 as as -> as 2019-06-25 16:47:10 +01:00
Sorunome 4f83cc1c24
moved client spoiler conversion to potential issues 2019-06-25 16:19:29 +02:00
Andrew Morgan 96e43aaf45 Define what characters lookup_pepper can consist of 2019-06-25 10:37:45 +01:00
Andrew Morgan f951f312e1 Fix terrible wording 2019-06-25 10:30:29 +01:00
Andrew Morgan fae6883cc0 Update with review comments 2019-06-25 10:18:11 +01:00
Andrew Morgan 0a4c83ddb9 no plural. 3pid -> 3PID 2019-06-24 17:54:23 +01:00
Andrew Morgan 36a35a33cc Clarify how the spec defines hashing algs 2019-06-24 16:59:58 +01:00
Andrew Morgan ee10576d60 Update with feedback 2019-06-24 15:43:19 +01:00
Andrew Morgan 02ac0f3b33 Give the user control! 2019-06-24 11:56:04 +01:00
Andrew Morgan acdb2b1b42 Merge branch 'hs/hash-identity' of github.com:matrix-org/matrix-doc into hs/hash-identity 2019-06-24 11:47:53 +01:00
Andrew Morgan e3ff80291f http err codes and hash wording fixes 2019-06-24 11:47:00 +01:00
Travis Ralston 21e93a123e Naming and capitalization 2019-06-21 11:36:16 -06:00