Commit graph

1578 commits

Author SHA1 Message Date
David Baker
98f1d4efec Merge pull request #308 from matrix-org/dbkr/get_pushers
Add endpoint for getting a user's pushers
2016-04-13 14:10:48 +01:00
David Baker
1a856b53f3 Remove redundant info & add backticks 2016-04-13 10:29:57 +01:00
Richard van der Hoff
647679cd66 Merge pull request #309 from matrix-org/rav/sanify_continuserv
Continuserv: Reduce number of watches
2016-04-12 11:17:44 +01:00
David Baker
4b294b23de Tailor descriptions to GET method 2016-04-12 09:56:24 +01:00
Richard van der Hoff
774b516c07 Merge pull request #302 from gergelypolonkai/event-parent
Add event as a parent for all event types
2016-04-12 07:08:51 +01:00
Richard van der Hoff
d6c1d1343b Continuserv: Reduce number of watches
rather than trying to watch half the filesystem, be a bit more conservative in
what we put watches on. This means that we don't end up dying with "No space on
device" (thanks for that, Linux.)
2016-04-11 23:21:21 +01:00
David Baker
4fafe1ab73 Return an object as the root element
Because otherwise it's impossible to change later
2016-04-11 17:56:38 +01:00
David Baker
42834340e7 Add title to the pushers array 2016-04-11 17:41:15 +01:00
David Baker
0f6e414eb6 Fix format (array of objects, not object) 2016-04-11 17:35:56 +01:00
David Baker
27113d71ff Fix indentation 2016-04-11 17:31:42 +01:00
David Baker
73d6e901ae Add endpoint for getting a user's pushers
Also add profile_tag to the set docs as it was missing
2016-04-11 17:25:36 +01:00
Kegsay
cb5a2f07eb Merge pull request #307 from Half-Shot/patch-1
Small copy paste error
2016-04-11 11:57:34 +01:00
Will Hunt
c9ed063a36 Small copy paste error
'avatar url' should be 'profile information'
2016-04-11 11:47:40 +01:00
Richard van der Hoff
cd4e7306ca Merge pull request #305 from matrix-org/rav/show_own_leave_event
Clarify `history_visibility` behaviour
2016-04-08 11:47:17 +01:00
David Baker
1d6c405f62 Fix presumably c+p fail 2016-04-06 21:00:12 +01:00
David Baker
0411cf54da Merge pull request #306 from matrix-org/dbkr/add_push_change_event_id
Change `id` -> `event_id` and include push section
2016-04-06 20:58:11 +01:00
David Baker
cf850b4270 Fix level of counts and devices
They are actually within the notification object rather than the top level object. Add titles to objects so it works.
2016-04-06 20:21:08 +01:00
David Baker
89453bfd8c Remove spurious blank line 2016-04-06 19:53:45 +01:00
David Baker
64c6d30f90 hopefully fix rst 2016-04-06 19:52:54 +01:00
David Baker
7faf2cf642 Paragraph breaks & missed word 2016-04-06 19:49:41 +01:00
David Baker
7e1cb9003c Make swagger valid 2016-04-06 18:41:15 +01:00
David Baker
71cb646541 Change id in the push gateway poke to be event_id and spec that it's the Matrix event ID of the message. Correct the spec for badge count pushes which omit fields previously described as mandatory. Add more detail about when to use event_id to suppress dupes. Also add the push gateway doc so it's actually included in the spec. 2016-04-06 18:28:21 +01:00
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
Gergely Polonkai
d94deb6296 Add event as a parent for all event types
Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
2016-03-16 16:46:16 +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