Commit Graph

6710 Commits (ea781ef7b2c618ebc56124ebfbe867fc5c575d0d)
 

Author SHA1 Message Date
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 740f775932 Fix a couple of typos, remove .m.rule.member_event 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
Oddvar Lovaas 92f75ec23c image urls 9 years ago
Oddvar Lovaas b4dedb0b0d new featured clients and update images. moved angular one out. 9 years ago
Oddvar Lovaas ad5a08e5b9 Merge branch 'master' of github.com:matrix-org/matrix-doc 9 years ago
Oddvar Lovaas b28989b2ad fix for https://github.com/matrix-org/matrix-doc/issues/270 9 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 9 years ago
Mark Haines 5d85e3a505 Remove indents 9 years ago
Mark Haines afe7638e30 Add a new title level to appease gendoc 9 years ago
Mark Haines b16af5ef64 Fix JSON, add headers 9 years ago
Mark Haines 8a1a02a11b Update the predefined push rules in the spec 9 years ago
Daniel Wagner-Hall 072d285153 speculator: Allow access token to be specified 9 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
Matthew Hodgson 41130314da random incoherent thoughts on reputation that should live somewhere 9 years ago
David Baker 2e1c2c23e4 Merge pull request #269 from matrix-org/dbkr/profile_return_null
Clarify what profile endpoints return if avatar url / display name isn't set
9 years ago
David Baker 53a4a563e2 Actually we think they should not be present (which means synapse is buggy). 9 years ago
David Baker 542b17e944 Clarify what profile endpoints return if avatar url / display name isn't set 9 years ago
Oddvar Lovaas 630ce3d5c6 wrong link 9 years ago
Richard van der Hoff cb87da12f2 Merge pull request #268 from matrix-org/rav/add_event_to_context
Add 'event' to event context API
9 years ago
Richard van der Hoff 58b346e204 s/user_id/sender/ in context example response 9 years ago
Richard van der Hoff b2e0a855cc Add 'event' to event context API
also link through to the event schemas
9 years ago
Daniel Wagner-Hall 2ed95a9a40 Merge pull request #267 from matrix-org/daniel/3pid
Specify login behaviour for unknown 3pids
9 years ago
Daniel Wagner-Hall 0da26cd7e1 Specify login behaviour for unknown 3pids 9 years ago
Mark Haines f291484709 Merge pull request #265 from matrix-org/markjh/3pid_login
Add 3pid password login to the spec
9 years ago
Mark Haines 245e8e8571 Add 3pid password login to the spec 9 years ago
Mark Haines 72d859609a Merge pull request #266 from matrix-org/markjh/three_pid_creds
Fix the key name to be three_pid_creds rather than threePidCreds
9 years ago
Mark Haines e7f80b7c71 Fix the key name to be three_pid_creds rather than threePidCreds 9 years ago
Daniel Wagner-Hall 9d1fc97505 Merge pull request #264 from matrix-org/daniel/unban
Require explicit un-banning
9 years ago
Daniel Wagner-Hall 2e46b587b8 Require explicit un-banning 9 years ago