Commit graph

1505 commits

Author SHA1 Message Date
Richard van der Hoff
b59d16c4d1 Clarify history_visibility behaviour
Clear up some lies in the history_visibility section, and clarify behaviour for
`m.room.history_visibility` and the user's own `m.room.member` events.
2016-04-06 17:55:01 +01:00
Oddvar Lovaas
12943134bd changed date 2016-03-22 10:27:08 +00:00
Oddvar Lovaas
24ec322daa Merge pull request #304 from Half-Shot/master
Added mpd-dj
2016-03-22 10:25:07 +00:00
Will Hunt
10501f2167 Added mpd-dj 2016-03-22 08:41:41 +00:00
Oddvar Lovaas
eafb3212af deleted 2016-03-21 15:14:42 +00:00
Oddvar Lovaas
8bc62da9eb Merge branch 'master' of github.com:matrix-org/matrix-doc 2016-03-21 15:14:07 +00:00
Oddvar Lovaas
306b471f46 oops 2016-03-21 15:13:32 +00:00
Oddvar Lovaas
f0244cc345 Merge pull request #299 from torhve/patch-2
Correctness
2016-03-21 15:07:44 +00:00
Oddvar Lovaas
39c56253b7 Merge pull request #298 from torhve/patch-1
Correct/Improve
2016-03-21 15:07:07 +00:00
Oddvar Lovaas
14f3f1f814 adding author 2016-03-17 18:05:27 +00:00
Oddvar Lovaas
13a8050b4e added intro 2016-03-17 17:12:04 +00:00
Oddvar Lovaas
3ce5453549 Merge pull request #300 from wastevensv/lets-encrypt-guide
Let's Encrypt Guide
2016-03-17 17:02:45 +00:00
Oddvar Lovaas
d07e89d199 spelling 2016-03-17 16:46:52 +00:00
Oddvar Lovaas
f7b5ae8ebc Merge pull request #303 from vberger/patch-1
FAQ: Add an answer about the choice of HTTP.
2016-03-17 16:44:10 +00:00
Victor Berger
923a961f6a FAQ: Add an answer about the choice of HTTP. 2016-03-17 17:17:15 +01:00
William Stevens
c2bbeb899d Update Let's Encrypt guide to match other guides. 2016-03-15 17:21:11 -04:00
William Stevens
2c16526c70 Added tutorial on using Let's Encrypt with Matrix. 2016-03-15 16:48:37 -04:00
Kegsay
dd6dfa7635 Merge pull request #291 from gergelypolonkai/room-avatar-image-info
Update m.room.avatar schema so it references image_info in info
2016-03-14 15:31:57 +00:00
Tor Hveem
7d66cdf828 Correctness 2016-03-13 14:34:49 +01:00
Tor Hveem
f7d6c9b8dc Correct/Improve 2016-03-13 14:31:48 +01:00
Daniel Wagner-Hall
92dfc0bb39 Merge pull request #297 from matrix-org/daniel/is
Specify address validating and binding
2016-03-10 16:54:50 +00:00
Daniel Wagner-Hall
313f09f5c0 Specify address validating and binding 2016-03-10 16:54:38 +00:00
Daniel Wagner-Hall
c234d3e377 Merge pull request #279 from matrix-org/daniel/strippedstate
Remove restrictions on StrippedState

Note also that these are purely informational and not things on which to
rely.

SPEC-357
2016-03-10 14:28:05 +00:00
Daniel Wagner-Hall
77f495d36f Remove restrictions on StrippedState
Note also that these are purely informational and not things on which to
rely.

SPEC-357
2016-03-10 14:27:54 +00:00
David Baker
39fe9e3896 Merge pull request #284 from matrix-org/dbkr/notification_counts
Add notification counts to doc
2016-03-10 14:10:44 +00:00
Kegsay
506accee27 Merge pull request #288 from matrix-org/markjh/pushrule_stream
Add a snippet of documentation for a m.push_rules event.
2016-03-10 14:05:42 +00:00
Kegsay
ffe3ec33f1 Merge pull request #290 from gergelypolonkai/master
Add invite key to m.room.power_levels schema
2016-03-10 14:04:26 +00:00
Daniel Wagner-Hall
b3af29e746 Merge pull request #296 from matrix-org/daniel/is3
Specify association lookup
2016-03-10 13:59:55 +00:00
Daniel Wagner-Hall
fecff8afdc Specify association lookup 2016-03-10 13:59:34 +00:00
Daniel Wagner-Hall
53886f3157 Merge pull request #295 from matrix-org/daniel/is2
Specify ephemeral invitation signing
2016-03-10 13:57:52 +00:00
Daniel Wagner-Hall
30c9fee0b2 Specify ephemeral invitation signing 2016-03-10 13:57:45 +00:00
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
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
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