Commit Graph

1928 Commits (66a50855ff3acd2574b7c4e868dbddd0d2c1c04c)
 

Author SHA1 Message Date
Mark Haines c3c95d0c09 Fix grammar and add backticks for /sync 10 years ago
Mark Haines cc0dae3aeb Deduplicate a couple of places where "the" was written twice in a row 10 years ago
David Baker 4a06f3e2a4 Merge pull request #289 from gergelypolonkai/master
Fix for m.room.third_party_invite schema
10 years ago
David Baker 9048fb9a7b Add CONTINUTING.rst 10 years ago
Gergely Polonkai 449bb09998 Fix for m.room.third_party_invite schema 10 years ago
Mark Haines 5407cc8e05 Add a snippet of documentation for a m.push_rules event. 10 years ago
David Baker 65e5a316bd Update spec to say what the default state / events defaults are, from inspecting the behaviour of synapse (which I'm not sure was intentional). 10 years ago
Daniel Wagner-Hall 646dd4f03a Merge pull request #285 from matrix-org/daniel/titles
Add titles where they're missing
10 years ago
Daniel Wagner-Hall 11c572267e Add titles where they're missing 10 years ago
Erik Johnston 3d4d91a462 Reword to make sense 10 years ago
Erik Johnston 167a08a805 Allow idle timeout to be configurable 10 years ago
Erik Johnston bc68177471 Grammar 10 years ago
David Baker a78dff3981 Add notification counts to doc 10 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
10 years ago
Mark Haines d2c05d64c7 Document an API for setting and getting the actions for a push rule 10 years ago
Mark Haines dc3b6f6320 Merge pull request #282 from matrix-org/markjh/get_enabled
Document GET for /pushrules/{scope}/{kind}/{ruleId}/enabled
10 years ago
Mark Haines 1f03552ff3 poke jenkins 10 years ago
Mark Haines 254fbe7983 Document GET for /pushrules/{scope}/{kind}/{ruleId}/enabled 10 years ago
David Baker e6143a6596 Merge pull request #281 from matrix-org/dbkr/fix_meta_escaping
Fix meta-escaping fail
10 years ago
David Baker 2c5392f1d1 Fix meta-escaping fail 10 years ago
Oddvar Lovaas b0856ffc3b more info 10 years ago
Oddvar Lovaas 65b776b4ec Merge branch 'master' of github.com:matrix-org/matrix-doc 10 years ago
Oddvar Lovaas 85e0e88c5e fixed link 10 years ago
Daniel Wagner-Hall 58faad1c24 Merge pull request #280 from matrix-org/daniel/newline
Include newline before table headings
10 years ago
Daniel Wagner-Hall 016ccf4544 Remove signed object which shouldn't exist 10 years ago
Daniel Wagner-Hall 902f25ef4a Include newline before table headings 10 years ago
Erik Johnston f1a8306d08 Spec currently_active time and idle timeout behaviour 10 years ago
Erik Johnston cbe466e572 Update API docs 10 years ago
Oddvar Lovaas cc1c8f33b2 update readme 10 years ago
Oddvar Lovaas 51fed0de36 add a template 10 years ago
Oddvar Lovaas 746ae4fd9c use images hosted locally 10 years ago
Daniel Wagner-Hall ffd6548cc3 Merge pull request #273 from matrix-org/daniel/multikeys2
/join accepts a signature for a third party invite
10 years ago
Daniel Wagner-Hall ccac9e7882 /join accepts a signature for a third party invite 10 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
10 years ago
Richard van der Hoff bc83677d98 Define the order for events returned by /context API 10 years ago
Richard van der Hoff bf7ca36cf6 Merge pull request #276 from matrix-org/rav/room_peeking
Split room previews into a separate module
10 years ago
Richard van der Hoff 68a4306773 Split room previews into a separate module
Guest access and room peeking are orthogonal
10 years ago
Mark Haines 740f775932 Fix a couple of typos, remove .m.rule.member_event 10 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.
10 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.
10 years ago
Daniel Wagner-Hall 5cedfc13e2 Merge pull request #272 from matrix-org/daniel/multikeys
m.third_party_invite: Allow multiple public keys
10 years ago
Oddvar Lovaas b9896bac71 better images 10 years ago
Oddvar Lovaas 92f75ec23c image urls 10 years ago
Oddvar Lovaas b4dedb0b0d new featured clients and update images. moved angular one out. 10 years ago
Oddvar Lovaas ad5a08e5b9 Merge branch 'master' of github.com:matrix-org/matrix-doc 10 years ago
Oddvar Lovaas b28989b2ad fix for https://github.com/matrix-org/matrix-doc/issues/270 10 years ago
Mark Haines 8a050aebc0 Add a note to the docs for before and after to make it clear that they cannot be used with the predefined rules 10 years ago
Mark Haines 5d85e3a505 Remove indents 10 years ago
Mark Haines afe7638e30 Add a new title level to appease gendoc 10 years ago
Mark Haines b16af5ef64 Fix JSON, add headers 10 years ago