Commit Graph

1516 Commits (cb5a2f07eb1b06ad2544d4de690f386fb7a2a8e4)
 

Author SHA1 Message Date
Mark Haines c3c95d0c09 Fix grammar and add backticks for /sync 8 years ago
Mark Haines cc0dae3aeb Deduplicate a couple of places where "the" was written twice in a row 8 years ago
David Baker 4a06f3e2a4 Merge pull request #289 from gergelypolonkai/master
Fix for m.room.third_party_invite schema
8 years ago
David Baker 9048fb9a7b Add CONTINUTING.rst 8 years ago
Gergely Polonkai 449bb09998 Fix for m.room.third_party_invite schema 8 years ago
Mark Haines 5407cc8e05 Add a snippet of documentation for a m.push_rules event. 8 years ago
Daniel Wagner-Hall 646dd4f03a Merge pull request #285 from matrix-org/daniel/titles
Add titles where they're missing
8 years ago
Daniel Wagner-Hall 11c572267e Add titles where they're missing 8 years ago
David Baker a78dff3981 Add notification counts to doc 8 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
8 years ago
Mark Haines d2c05d64c7 Document an API for setting and getting the actions for a push rule 8 years ago
Mark Haines dc3b6f6320 Merge pull request #282 from matrix-org/markjh/get_enabled
Document GET for /pushrules/{scope}/{kind}/{ruleId}/enabled
8 years ago
Mark Haines 1f03552ff3 poke jenkins 8 years ago
Mark Haines 254fbe7983 Document GET for /pushrules/{scope}/{kind}/{ruleId}/enabled 8 years ago
David Baker e6143a6596 Merge pull request #281 from matrix-org/dbkr/fix_meta_escaping
Fix meta-escaping fail
8 years ago
David Baker 2c5392f1d1 Fix meta-escaping fail 8 years ago
Oddvar Lovaas b0856ffc3b more info 8 years ago
Oddvar Lovaas 65b776b4ec Merge branch 'master' of github.com:matrix-org/matrix-doc 8 years ago
Oddvar Lovaas 85e0e88c5e fixed link 8 years ago
Daniel Wagner-Hall 58faad1c24 Merge pull request #280 from matrix-org/daniel/newline
Include newline before table headings
8 years ago
Daniel Wagner-Hall 016ccf4544 Remove signed object which shouldn't exist 8 years ago
Daniel Wagner-Hall 902f25ef4a Include newline before table headings 8 years ago
Oddvar Lovaas cc1c8f33b2 update readme 8 years ago
Oddvar Lovaas 51fed0de36 add a template 8 years ago
Oddvar Lovaas 746ae4fd9c use images hosted locally 8 years ago
Daniel Wagner-Hall ffd6548cc3 Merge pull request #273 from matrix-org/daniel/multikeys2
/join accepts a signature for a third party invite
8 years ago
Daniel Wagner-Hall ccac9e7882 /join accepts a signature for a third party invite 8 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
8 years ago
Richard van der Hoff bc83677d98 Define the order for events returned by /context API 8 years ago
Richard van der Hoff bf7ca36cf6 Merge pull request #276 from matrix-org/rav/room_peeking
Split room previews into a separate module
8 years ago
Richard van der Hoff 68a4306773 Split room previews into a separate module
Guest access and room peeking are orthogonal
8 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.
8 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.
8 years ago
Daniel Wagner-Hall 5cedfc13e2 Merge pull request #272 from matrix-org/daniel/multikeys
m.third_party_invite: Allow multiple public keys
8 years ago
Oddvar Lovaas b9896bac71 better images 8 years ago
Oddvar Lovaas 92f75ec23c image urls 8 years ago
Oddvar Lovaas b4dedb0b0d new featured clients and update images. moved angular one out. 8 years ago
Oddvar Lovaas ad5a08e5b9 Merge branch 'master' of github.com:matrix-org/matrix-doc 8 years ago
Oddvar Lovaas b28989b2ad fix for https://github.com/matrix-org/matrix-doc/issues/270 8 years ago
Daniel Wagner-Hall 072d285153 speculator: Allow access token to be specified 8 years ago
Oddvar Lovaas 5d2eae58bd adding descriptions; moving things around 9 years ago
Oddvar Lovaas 6b4af54f42 remove the ubuntu entry for now 9 years ago
Oddvar Lovaas 1779f82410 remove for now 9 years ago
Oddvar Lovaas 02fc978241 README 9 years ago
Oddvar Lovaas 0e6a9af434 moving things around 9 years ago
Daniel Wagner-Hall ea170e5dca m.third_party_invite: Allow multiple public keys 9 years ago
Daniel Wagner-Hall 2890d282e3 Merge pull request #271 from matrix-org/daniel/asids
Add ID to AS guide
9 years ago
Daniel Wagner-Hall bf6bff3af6 Add ID to AS guide 9 years ago
Oddvar Lovaas 8c05e12cfc All the Matrix projects 9 years ago
Matthew Hodgson 6925547875 remove the oversimplification that the WebRTC standard is based around two-oparty communication 9 years ago