Commit graph

1704 commits

Author SHA1 Message Date
Richard van der Hoff
9eba63b816 CONTRIBUTING PR feedback
* Make it clear that we won't do spec changes unless backed up by working
  implementations.

* Try to pin down when we expect a proposal doc a bit better
2016-07-13 12:19:42 +01:00
Richard van der Hoff
6cfc025bb8 CONTRIBUTING: add link to docs folder 2016-07-13 11:32:40 +01:00
Richard van der Hoff
85594d4d97 add special-snowflake CONTRIBUTING for matrix-doc 2016-07-13 10:51:27 +01:00
Richard van der Hoff
ac006f8e1e Merge pull request #351 from matrix-org/rav/room_naming
Clarify the room-naming behaviour
2016-07-12 14:53:21 +01:00
Richard van der Hoff
885e6797f2 Fix double-negative in room naming 2016-07-12 14:50:49 +01:00
Richard van der Hoff
d724b6bf75 Make null m.room.name behaviour explicit
PR feedback
2016-07-12 13:44:04 +01:00
Richard van der Hoff
7b4c21fa77 Add link to room name bug 2016-07-12 11:47:39 +01:00
Richard van der Hoff
be9dccb266 m.room.canonical alias: fix schema syntax 2016-07-12 10:04:01 +01:00
Richard van der Hoff
d4194dd24e Clarify the room-naming behaviour
Make behaviour on empty `m.room.name` and `m.room.canonical_alias` events
explicit.
2016-07-11 17:49:27 +01:00
Oddvar Lovaas
bb54adc790 adding F-Droid 2016-07-11 10:48:13 +01:00
David Baker
777d72aad1 Merge pull request #346 from matrix-org/dbkr/more_requesttokens
Add requestToken endpoints
2016-07-08 14:56:11 +01:00
David Baker
e91214e78e More links
Also remove now redundant anchor
2016-07-08 14:26:18 +01:00
David Baker
11c60b0409 Merge pull request #347 from matrix-org/dbkr/dont_line_wrap_rst
Don't line wrap the API descriptions
2016-07-08 14:24:44 +01:00
David Baker
cf13c8997c Merge branch 'dbkr/dont_line_wrap_rst' into dbkr/more_requesttokens 2016-07-08 13:54:30 +01:00
David Baker
d66ea3c3ce Don't line wrap the API descriptions
They are in RST format which is whitespace sensitive and threfore can't be line wrapped without breaking the syntax.

There is more wrapping in other places but some of it is into tables where it does need to be fixed width in order for the RST table to parse correctly.
2016-07-08 11:57:40 +01:00
David Baker
7c8651480a Some PR feedback corrections
Including adding a hyperlink, although this requires a separate fix that I'll do on a different branch
2016-07-08 11:56:23 +01:00
Richard van der Hoff
19a59bc210 Merge pull request #345 from Ralith/require-prev_batch
Supply prev_batch unconditionally in timelines
2016-07-07 21:08:56 +01:00
David Baker
c109da5b78 Attempt to make things clearer 2016-07-07 17:07:38 +01:00
David Baker
86db820bb1 Expand on summaries for requestToken endpoints 2016-07-07 16:05:21 +01:00
David Baker
4812be9142 Missing . 2016-07-07 15:58:20 +01:00
David Baker
191cb08a3a Add response section otherwise the checker fails 2016-07-07 15:00:27 +01:00
David Baker
d74a320edd Stray tab 2016-07-07 14:58:05 +01:00
David Baker
ead5648b8c Add requestToken endpoints
For password reset and 3pid adding
2016-07-07 14:52:45 +01:00
Benjamin Saunders
ee5054fb42 Supply prev_batch unconditionally in timelines
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
2016-07-07 01:37:48 -07:00
David Baker
ef4c03894d Merge pull request #343 from matrix-org/dbkr/threepid_requesttoken
Spec for endpoint-specific 3pid verification token
2016-07-05 15:17:18 +01:00
David Baker
14ff3862e3 More PR feedback 2016-07-05 15:15:44 +01:00
Richard van der Hoff
df3f4b4ecf Fix link to draft e2e spec 2016-06-30 18:01:32 +01:00
Oddvar Lovaas
7b36cedd8b adding link to spreadsheet in synapse project page 2016-06-30 17:20:57 +01:00
Oddvar Lovaas
04c2fa23e3 Merge branch 'master' of github.com:matrix-org/matrix-doc 2016-06-30 17:18:00 +01:00
Oddvar Lovaas
054829f590 adding 2016-06-30-hdd-space-calc-for-synapse.md 2016-06-30 17:17:40 +01:00
David Baker
e4db7be8e2 Better structure for error response
& add server not trusted error
2016-06-30 16:22:01 +01:00
David Baker
3dddc0dcdf Explain why not erroring on dup 3pid is desireable 2016-06-30 16:13:45 +01:00
David Baker
a600386c05 Consistent working for error response
Also format json example better
2016-06-30 16:12:11 +01:00
David Baker
572aa24a88 Add M_THREEPID_IN_USE 2016-06-30 15:40:20 +01:00
David Baker
60293af83a PR feedback 2016-06-30 15:25:09 +01:00
David Baker
6a0c9edb49 Add the id_server param 2016-06-30 15:19:44 +01:00
David Baker
b0194a3016 Spec for endpoint-specific 3pid verification token
As per proposal https://docs.google.com/document/d/13mapDbaOnbob9ZYRDiGm1YbeZhFOBj_R1OvgBA9pA5s/edit?pref=2&pli=1#
2016-06-30 14:50:17 +01:00
Richard van der Hoff
4f37e4ece0 Merge pull request #342 from matrix-org/erikj/presence
Fix and correctly document presence's currently_active
2016-06-29 11:36:55 +01:00
Erik Johnston
c83940750c Update m.presence 2016-06-29 10:42:33 +01:00
Erik Johnston
0de8ba7f0a currently_active is a param on GET response, not put 2016-06-29 10:35:31 +01:00
Richard van der Hoff
f6787b2835 Merge pull request #339 from matrix-org/rav/better_error_messages
Give better error messages when parsing fails
2016-06-23 09:49:51 +01:00
Richard van der Hoff
bebf8f765c Merge pull request #341 from matrix-org/rav/power_levels
m.room.power_levels: clarify documentation
2016-06-22 17:52:14 +01:00
Richard van der Hoff
c0e5f3c3ca matrix_templates/units.py: add some comments
... to help understand the slightly cryptic python incantation.
2016-06-22 17:50:34 +01:00
Richard van der Hoff
adb5768731 m.room.power_levels: clarify documentation
- clarify description and add text for invite, ban, etc.
- the keys aren't required. Document their defaults
- add 'invite' to example
2016-06-22 17:45:49 +01:00
Richard van der Hoff
0be787a930 Merge pull request #340 from matrix-org/markjh/default_rule_change
Document changes to the default push rules
2016-06-22 17:36:24 +01:00
Richard van der Hoff
3085257d11 Merge pull request #338 from matrix-org/rav/yamlify_event_schemas
Convert event schemas to yaml
2016-06-22 17:32:26 +01:00
Richard van der Hoff
e594132e95 m.room.member: yaml tweak
Quote "string" for consistency with "null"
2016-06-22 17:32:01 +01:00
Mark Haines
af091ff614 Document changes to the default push rules 2016-06-22 16:34:23 +01:00
Mark Haines
30a3302921 Merge pull request #274 from matrix-org/markjh/default_rules
Update the predefined push rules in the spec
2016-06-22 16:14:21 +01:00
Erik Johnston
e80e32173f Merge pull request #278 from matrix-org/erikj/presence
Update presence spec.
2016-06-22 14:08:44 +01:00