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

2996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Wagner-Hall e02056a830 Merge pull request #294 from matrix-org/daniel/is 
Loosely specify invitation storage
 2016-03-09 17:28:06 +00:00
Daniel Wagner-Hall 097b69dc1e Loosely specify invitation storage 2016-03-09 17:27:44 +00:00
Daniel Wagner-Hall 7868fb1a08 Merge pull request #293 from matrix-org/daniel/is 
Add initial identity server spec

More to come
 2016-03-09 15:49:26 +00:00
Daniel Wagner-Hall e0c55eeccf Add initial identity server spec 
More to come
 2016-03-09 15:49:23 +00:00
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.
 2016-03-08 17:42:44 +00:00
Daniel Wagner-Hall f4f186baee Add _cs suffix to client-server http APIs 
I'm about to add identity service APIs, so differentiating is good.
 2016-03-08 17:42:41 +00:00
Gergely Polonkai 6e2b02a608 Update m.room.avatar schema so it references image_info in info 
Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
 2016-03-08 16:32:19 +01:00
Gergely Polonkai 583c8cbfaf Add invite key to m.room.power_levels schema 
Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
 2016-03-08 15:50:27 +01:00
Mark Haines c3c95d0c09 Fix grammar and add backticks for /sync 2016-03-08 10:17:27 +00:00
Mark Haines cc0dae3aeb Deduplicate a couple of places where "the" was written twice in a row 2016-03-07 11:31:49 +00:00
David Baker 4a06f3e2a4 Merge pull request #289 from gergelypolonkai/master 
Fix for m.room.third_party_invite schema
 2016-03-04 16:10:07 +00:00
David Baker 9048fb9a7b Add CONTINUTING.rst 2016-03-04 16:08:46 +00:00
Gergely Polonkai 449bb09998 Fix for m.room.third_party_invite schema 2016-03-04 16:58:02 +01:00
Mark Haines 5407cc8e05 Add a snippet of documentation for a m.push_rules event. 2016-03-04 14:41:30 +00:00
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). 2016-03-02 18:31:14 +00:00
Daniel Wagner-Hall 646dd4f03a Merge pull request #285 from matrix-org/daniel/titles 
Add titles where they're missing
 2016-03-02 15:37:19 +00:00
Daniel Wagner-Hall 11c572267e Add titles where they're missing 2016-03-02 15:23:48 +00:00
Erik Johnston 3d4d91a462 Reword to make sense 2016-03-01 16:15:59 +00:00
Erik Johnston 167a08a805 Allow idle timeout to be configurable 2016-03-01 16:13:41 +00:00
Erik Johnston bc68177471 Grammar 2016-03-01 16:07:25 +00:00
David Baker a78dff3981 Add notification counts to doc 2016-03-01 11:40:52 +00:00
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
 2016-02-26 13:27:22 +00:00
Mark Haines d2c05d64c7 Document an API for setting and getting the actions for a push rule 2016-02-26 13:27:19 +00:00
Mark Haines dc3b6f6320 Merge pull request #282 from matrix-org/markjh/get_enabled 
Document GET for /pushrules/{scope}/{kind}/{ruleId}/enabled
 2016-02-25 13:16:52 +00:00
Mark Haines 1f03552ff3 poke jenkins 2016-02-25 11:13:09 +00:00
Mark Haines 254fbe7983 Document GET for /pushrules/{scope}/{kind}/{ruleId}/enabled 2016-02-25 10:51:42 +00:00
David Baker e6143a6596 Merge pull request #281 from matrix-org/dbkr/fix_meta_escaping 
Fix meta-escaping fail
 2016-02-24 14:15:55 +00:00
David Baker 2c5392f1d1 Fix meta-escaping fail 2016-02-24 14:00:57 +00:00
Oddvar Lovaas b0856ffc3b more info 2016-02-23 17:42:32 +00:00
Oddvar Lovaas 65b776b4ec Merge branch 'master' of github.com:matrix-org/matrix-doc 2016-02-23 17:34:26 +00:00
Oddvar Lovaas 85e0e88c5e fixed link 2016-02-23 17:34:09 +00:00
Daniel Wagner-Hall 58faad1c24 Merge pull request #280 from matrix-org/daniel/newline 
Include newline before table headings
 2016-02-23 16:30:59 +00:00
Daniel Wagner-Hall 016ccf4544 Remove signed object which shouldn't exist 2016-02-23 15:19:45 +00:00
Daniel Wagner-Hall 902f25ef4a Include newline before table headings 2016-02-23 14:43:36 +00:00
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