Commit Graph

1531 Commits (30b39d64558bb7a46e03455df654827a58e36b2b)
 

Author SHA1 Message Date
David Baker 39fe9e3896 Merge pull request #284 from matrix-org/dbkr/notification_counts
Add notification counts to doc
9 years ago
Kegsay 506accee27 Merge pull request #288 from matrix-org/markjh/pushrule_stream
Add a snippet of documentation for a m.push_rules event.
9 years ago
Kegsay ffe3ec33f1 Merge pull request #290 from gergelypolonkai/master
Add invite key to m.room.power_levels schema
9 years ago
Daniel Wagner-Hall b3af29e746 Merge pull request #296 from matrix-org/daniel/is3
Specify association lookup
9 years ago
Daniel Wagner-Hall fecff8afdc Specify association lookup 9 years ago
Daniel Wagner-Hall 53886f3157 Merge pull request #295 from matrix-org/daniel/is2
Specify ephemeral invitation signing
9 years ago
Daniel Wagner-Hall 30c9fee0b2 Specify ephemeral invitation signing 9 years ago
Daniel Wagner-Hall e02056a830 Merge pull request #294 from matrix-org/daniel/is
Loosely specify invitation storage
9 years ago
Daniel Wagner-Hall 097b69dc1e Loosely specify invitation storage 9 years ago
Daniel Wagner-Hall 7868fb1a08 Merge pull request #293 from matrix-org/daniel/is
Add initial identity server spec

More to come
9 years ago
Daniel Wagner-Hall e0c55eeccf Add initial identity server spec
More to come
9 years ago
Daniel Wagner-Hall 446ad008be Merge pull request #292 from matrix-org/daniel/is
Add _cs suffix to client-server http APIs

I'm about to add identity service APIs, so differentiating is good.
9 years ago
Daniel Wagner-Hall f4f186baee Add _cs suffix to client-server http APIs
I'm about to add identity service APIs, so differentiating is good.
9 years ago
Gergely Polonkai 6e2b02a608 Update m.room.avatar schema so it references image_info in info
Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
9 years ago
Gergely Polonkai 583c8cbfaf Add invite key to m.room.power_levels schema
Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
9 years ago
Mark Haines c3c95d0c09 Fix grammar and add backticks for /sync 9 years ago
Mark Haines cc0dae3aeb Deduplicate a couple of places where "the" was written twice in a row 9 years ago
David Baker 4a06f3e2a4 Merge pull request #289 from gergelypolonkai/master
Fix for m.room.third_party_invite schema
9 years ago
David Baker 9048fb9a7b Add CONTINUTING.rst 9 years ago
Gergely Polonkai 449bb09998 Fix for m.room.third_party_invite schema 9 years ago
Mark Haines 5407cc8e05 Add a snippet of documentation for a m.push_rules event. 9 years ago
Daniel Wagner-Hall 646dd4f03a Merge pull request #285 from matrix-org/daniel/titles
Add titles where they're missing
9 years ago
Daniel Wagner-Hall 11c572267e Add titles where they're missing 9 years ago
David Baker a78dff3981 Add notification counts to doc 9 years ago
Mark Haines 5c1bc0eb80 Merge pull request #283 from matrix-org/markjh/change_action
Document an API for setting and getting the actions for a push rule
9 years ago
Mark Haines d2c05d64c7 Document an API for setting and getting the actions for a push rule 9 years ago
Mark Haines dc3b6f6320 Merge pull request #282 from matrix-org/markjh/get_enabled
Document GET for /pushrules/{scope}/{kind}/{ruleId}/enabled
9 years ago
Mark Haines 1f03552ff3 poke jenkins 9 years ago
Mark Haines 254fbe7983 Document GET for /pushrules/{scope}/{kind}/{ruleId}/enabled 9 years ago
David Baker e6143a6596 Merge pull request #281 from matrix-org/dbkr/fix_meta_escaping
Fix meta-escaping fail
9 years ago
David Baker 2c5392f1d1 Fix meta-escaping fail 9 years ago
Oddvar Lovaas b0856ffc3b more info 9 years ago
Oddvar Lovaas 65b776b4ec Merge branch 'master' of github.com:matrix-org/matrix-doc 9 years ago
Oddvar Lovaas 85e0e88c5e fixed link 9 years ago
Daniel Wagner-Hall 58faad1c24 Merge pull request #280 from matrix-org/daniel/newline
Include newline before table headings
9 years ago
Daniel Wagner-Hall 016ccf4544 Remove signed object which shouldn't exist 9 years ago
Daniel Wagner-Hall 902f25ef4a Include newline before table headings 9 years ago
Oddvar Lovaas cc1c8f33b2 update readme 9 years ago
Oddvar Lovaas 51fed0de36 add a template 9 years ago
Oddvar Lovaas 746ae4fd9c use images hosted locally 9 years ago
Daniel Wagner-Hall ffd6548cc3 Merge pull request #273 from matrix-org/daniel/multikeys2
/join accepts a signature for a third party invite
9 years ago
Daniel Wagner-Hall ccac9e7882 /join accepts a signature for a third party invite 9 years ago
Richard van der Hoff 8e0cf9c7ac Merge pull request #277 from matrix-org/rav/define_order_for_event_context
Define the order for events returned by /context API
9 years ago
Richard van der Hoff bc83677d98 Define the order for events returned by /context API 9 years ago
Richard van der Hoff bf7ca36cf6 Merge pull request #276 from matrix-org/rav/room_peeking
Split room previews into a separate module
9 years ago
Richard van der Hoff 68a4306773 Split room previews into a separate module
Guest access and room peeking are orthogonal
9 years ago
Mark Haines 193e05275b Merge pull request #275 from matrix-org/markjh/remove_device_specific_rules
Remove references to device specific push rules

Since they weren't implemented on the servers and weren't
used by the clients.
9 years ago
Mark Haines 3db6980e0b Remove references to device specific push rules
Since they weren't implemented on the servers and weren't
used by the clients.
9 years ago
Daniel Wagner-Hall 5cedfc13e2 Merge pull request #272 from matrix-org/daniel/multikeys
m.third_party_invite: Allow multiple public keys
9 years ago
Oddvar Lovaas b9896bac71 better images 9 years ago