Commit graph

1842 commits

Author SHA1 Message Date
Richard van der Hoff
b5f9e896ba C-S spec: Fix 'unstable' in link to /context API 2016-07-14 16:20:59 +01:00
Richard van der Hoff
76ec390c73 changelog: Add "unreleased" placeholder 2016-07-14 15:44:17 +01:00
Richard van der Hoff
a2ab6854ff CS spec: Add r0.2.0 to historical version list 2016-07-14 15:40:49 +01:00
Richard van der Hoff
005a71ab00 Bump version in changelog 2016-07-14 15:19:47 +01:00
Richard van der Hoff
c71c9e4f6b Merge branch 'master' into release/client-server/r0.2.0 2016-07-14 15:17:40 +01:00
Richard van der Hoff
ae489260a1 Merge pull request #359 from matrix-org/rav/mxid_grammar
Define MXID grammar
2016-07-14 15:16:15 +01:00
Richard van der Hoff
72449294bc Moar TODO 2016-07-14 15:04:16 +01:00
Richard van der Hoff
0ac04f5649 Merge branch 'master' into release/client-server/r0.2.0 2016-07-14 14:40:46 +01:00
Richard van der Hoff
76fd85f054 Merge branch 'master' into release/client-server/r0.2.0 2016-07-14 14:38:59 +01:00
Richard van der Hoff
a2f1c6a7a6 Add a TODO about defining non-latin login creds 2016-07-14 14:38:04 +01:00
Erik Johnston
e5f5d0c55e Merge pull request #361 from matrix-org/erikj/account_deactivate
Spec /account/deactivate API
2016-07-14 11:15:32 +01:00
Richard van der Hoff
0e26238386 Update README
Structure and Contributing were both a bit out of date.
2016-07-14 10:52:30 +01:00
Erik Johnston
06d379ed5e Add to changelog 2016-07-14 10:18:48 +01:00
Richard van der Hoff
b5d68b8ff1 Link to doc style doc
(and update it to cover extra section characters)
2016-07-14 10:13:10 +01:00
Erik Johnston
a48437ced8 Spec /account/deactivate API 2016-07-14 10:11:38 +01:00
Richard van der Hoff
4d2bee4b56 Prepare changelog for 0.2.0 release 2016-07-13 21:20:25 +01:00
Richard van der Hoff
cdd19dca7f fix typos 2016-07-13 18:32:29 +01:00
Richard van der Hoff
f942b6e5c1 remove some redundant words 2016-07-13 18:27:40 +01:00
Richard van der Hoff
001db45046 s/mxid/user id/, and other PR feedback. 2016-07-13 18:20:11 +01:00
Richard van der Hoff
56547ad373 Merge pull request #358 from matrix-org/rav/contributing
CONTRIBUTING for matrix-doc
2016-07-13 16:27:13 +01:00
Richard van der Hoff
e628edfdc6 Define MXID grammar
Quick! Write down the decisions on the grammar before we get a chance to change
our minds!

Also some placeholder sections for other types of identifier.
2016-07-13 15:24:31 +01:00
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
8ac45d7948 Merge pull request #353 from matrix-org/rav/room_membership
Clarify the room-membership APIs
2016-07-13 11:34:14 +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
0c06ea0e67 Merge pull request #356 from matrix-org/rav/fix_redaction
Fix name of prev_content to preserve on redactions
2016-07-13 11:14:07 +01:00
Richard van der Hoff
079721d798 Merge pull request #355 from matrix-org/rav/link_undeprecated_endpoints
Mark deprecated endpoints with their replacements
2016-07-13 11:10:29 +01:00
Richard van der Hoff
a9d3cfd13c Merge branch 'master' into rav/link_undeprecated_endpoints 2016-07-13 11:09:53 +01:00
Richard van der Hoff
d92515bce3 Merge pull request #354 from matrix-org/rav/reorder_deprecated_initialsync
Move /room/x/initialSync to after the undeprecated APIs
2016-07-13 11:07:11 +01:00
Richard van der Hoff
7080fd0618 Merge pull request #348 from Ralith/room-messages
Add missing "to" parameter to /messages
2016-07-13 11:01:56 +01:00
Richard van der Hoff
d8a47dbb5d Merge pull request #352 from matrix-org/rav/kill_old_sync
Remove references to intialSync etc, and rewrite syncing
2016-07-13 10:54:02 +01:00
Richard van der Hoff
85594d4d97 add special-snowflake CONTRIBUTING for matrix-doc 2016-07-13 10:51:27 +01:00
Benjamin Saunders
dc7fc0309e Add missing "to" parameter to /messages
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
2016-07-12 20:38:53 -07:00
Richard van der Hoff
2783635fbe Merge pull request #357 from matrix-org/rav/add_license
Add a license to the spec
2016-07-12 23:14:52 +01:00
Richard van der Hoff
49cd65dd58 Add a license to the spec
We're licensing hte spec under ASLv2. Add the LICENSE file, and add the
short-form to as much of the source as is practical right now (adding it to
json source is a massive pita).
2016-07-12 17:28:30 +01:00
Richard van der Hoff
1c6eed5c35 Fix name of prev_content to preserve on redactions
The field is called prev_content, not prev_state.
2016-07-12 16:34:16 +01:00
Richard van der Hoff
6bcb1798f5 Mark deprecated endpoints with their replacements
Fixes https://matrix.org/jira/browse/SPEC-415
2016-07-12 16:18:48 +01:00
Richard van der Hoff
9d267795e0 Move /room/x/initialSync to after the undeprecated APIs
It's a bit incongruous to have to read through the deprecated /initialSync to
get to the good stuff. Separate out intialSync so that we can move it later in
the spec.
2016-07-12 15:03:20 +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
4118ce6680 Add rationale to /sync 2016-07-12 14:48:03 +01:00
Richard van der Hoff
7186ecba7f Clarify the room-membership APIs
* give join/invite their own subsection
* move ban/unban into the banning section
* document forgettting and kicking
2016-07-12 14:18:48 +01:00
Richard van der Hoff
017935d8e9 Fix typo 2016-07-12 14:15:52 +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
6dfc923c1d Remove references to intialSync etc, and rewrite syncing
The 'Events' section of the C-S spec was full of outdated references to the v1
sync api, which is long dead. (https://matrix.org/jira/browse/SPEC-414).

Also, try to clarify why /sync distinguishes state and timeline
(https://matrix.org/jira/browse/SPEC-423).
2016-07-12 13:10:36 +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