Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-29 12:08:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3162 commits 30 branches 42 tags 32 MiB
Commit graph

3162 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik Johnston f1a8306d08 Spec currently_active time and idle timeout behaviour 2016-02-23 11:25:47 +00:00
Erik Johnston cbe466e572 Update API docs 2016-02-23 11:25:43 +00:00
Oddvar Lovaas cc1c8f33b2 update readme 2016-02-22 17:41:52 +00:00
Oddvar Lovaas 51fed0de36 add a template 2016-02-22 17:37:29 +00:00
Oddvar Lovaas 746ae4fd9c use images hosted locally 2016-02-22 16:51:55 +00:00
Daniel Wagner-Hall ffd6548cc3 Merge pull request #273 from matrix-org/daniel/multikeys2 
/join accepts a signature for a third party invite
 2016-02-22 14:54:26 +00:00
Daniel Wagner-Hall ccac9e7882 /join accepts a signature for a third party invite 2016-02-22 14:54:23 +00:00
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
 2016-02-19 17:09:35 +00:00
Richard van der Hoff bc83677d98 Define the order for events returned by /context API 2016-02-19 16:52:03 +00:00
Richard van der Hoff bf7ca36cf6 Merge pull request #276 from matrix-org/rav/room_peeking 
Split room previews into a separate module
 2016-02-19 16:36:50 +00:00
Richard van der Hoff 68a4306773 Split room previews into a separate module 
Guest access and room peeking are orthogonal
 2016-02-19 15:26:28 +00:00
Mark Haines 740f775932 Fix a couple of typos, remove .m.rule.member_event 2016-02-18 18:36:08 +00:00
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.
 2016-02-18 16:05:50 +00:00
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.
 2016-02-18 16:05:47 +00:00
Daniel Wagner-Hall 5cedfc13e2 Merge pull request #272 from matrix-org/daniel/multikeys 
m.third_party_invite: Allow multiple public keys
 2016-02-18 15:46:45 +00:00
Oddvar Lovaas b9896bac71 better images 2016-02-16 16:38:10 +00:00
Oddvar Lovaas 92f75ec23c image urls 2016-02-16 16:26:21 +00:00
Oddvar Lovaas b4dedb0b0d new featured clients and update images. moved angular one out. 2016-02-16 16:20:26 +00:00
Oddvar Lovaas ad5a08e5b9 Merge branch 'master' of github.com:matrix-org/matrix-doc 2016-02-16 11:01:32 +00:00
Oddvar Lovaas b28989b2ad fix for https://github.com/matrix-org/matrix-doc/issues/270 2016-02-16 11:01:04 +00:00
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 2016-02-15 17:17:58 +00:00
Mark Haines 5d85e3a505 Remove indents 2016-02-15 16:53:08 +00:00
Mark Haines afe7638e30 Add a new title level to appease gendoc 2016-02-15 16:50:15 +00:00
Mark Haines b16af5ef64 Fix JSON, add headers 2016-02-15 16:41:47 +00:00
Mark Haines 8a1a02a11b Update the predefined push rules in the spec 2016-02-15 16:28:43 +00:00
Daniel Wagner-Hall 072d285153 speculator: Allow access token to be specified 2016-02-15 14:48:26 +00:00
Oddvar Lovaas 5d2eae58bd adding descriptions; moving things around 2016-02-12 16:38:19 +00:00
Oddvar Lovaas 6b4af54f42 remove the ubuntu entry for now 2016-02-12 15:58:52 +00:00
Oddvar Lovaas 1779f82410 remove for now 2016-02-12 15:56:06 +00:00
Oddvar Lovaas 02fc978241 README 2016-02-12 15:39:32 +00:00
Oddvar Lovaas 0e6a9af434 moving things around 2016-02-12 15:28:10 +00:00
Daniel Wagner-Hall ea170e5dca m.third_party_invite: Allow multiple public keys 2016-02-12 13:15:21 +00:00
Daniel Wagner-Hall 2890d282e3 Merge pull request #271 from matrix-org/daniel/asids 
Add ID to AS guide
 2016-02-12 11:42:56 +00:00
Daniel Wagner-Hall bf6bff3af6 Add ID to AS guide 2016-02-12 11:31:43 +00:00
Oddvar Lovaas 8c05e12cfc All the Matrix projects 2016-02-12 11:15:18 +00:00
Matthew Hodgson 6925547875 remove the oversimplification that the WebRTC standard is based around two-oparty communication 2016-02-11 18:34:28 +00:00
Matthew Hodgson 41130314da random incoherent thoughts on reputation that should live somewhere 2016-02-09 12:07:58 +00:00
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
 2016-02-03 15:07:54 +00:00
David Baker 53a4a563e2 Actually we think they should not be present (which means synapse is buggy). 2016-02-03 14:54:29 +00:00
David Baker 542b17e944 Clarify what profile endpoints return if avatar url / display name isn't set 2016-02-03 13:14:12 +00:00
Oddvar Lovaas 630ce3d5c6 wrong link 2016-02-03 10:11:58 +00:00
Richard van der Hoff cb87da12f2 Merge pull request #268 from matrix-org/rav/add_event_to_context 
Add 'event' to event context API
 2016-02-01 18:56:45 +01:00
Richard van der Hoff 58b346e204 s/user_id/sender/ in context example response 2016-02-01 17:50:36 +00:00
Richard van der Hoff b2e0a855cc Add 'event' to event context API 
also link through to the event schemas
 2016-02-01 17:45:45 +00:00
Daniel Wagner-Hall 2ed95a9a40 Merge pull request #267 from matrix-org/daniel/3pid 
Specify login behaviour for unknown 3pids
 2016-01-29 16:58:10 +00:00
Daniel Wagner-Hall 0da26cd7e1 Specify login behaviour for unknown 3pids 2016-01-29 16:49:54 +00:00
Mark Haines f291484709 Merge pull request #265 from matrix-org/markjh/3pid_login 
Add 3pid password login to the spec
 2016-01-29 15:42:21 +01:00
Mark Haines 245e8e8571 Add 3pid password login to the spec 2016-01-29 14:42:18 +00:00
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
 2016-01-29 15:39:41 +01:00
Mark Haines e7f80b7c71 Fix the key name to be three_pid_creds rather than threePidCreds 2016-01-29 13:00:59 +00:00