Commit graph

412 commits

Author SHA1 Message Date
Kegan Dougal
d01ff6b495 Add noddy push gateway placeholder 2015-12-08 16:37:51 +00:00
Daniel Wagner-Hall
a2283f5499 Remove /notify from client-server API 2015-12-08 13:25:31 +00:00
Daniel Wagner-Hall
19dfafe376 Remove superfluous space
This causes a <dt> to get rendered around the <tt>s which breaks some
formatting.
2015-12-08 10:34:48 +00:00
Richard van der Hoff
3939ccf20c Remove e2e drafts from master
This is now being tracked in the main spec, on the drafts/e2e branch.
2015-12-07 14:45:46 +00:00
Daniel Wagner-Hall
39f43abbb7 Add per-API changelogs 2015-12-07 14:24:10 +00:00
Daniel Wagner-Hall
705556634a Add filters 2015-12-04 19:46:45 +00:00
Daniel Wagner-Hall
72e12bc2f5 Merge pull request #205 from jimmycuadra/signing-details-typo
Fix typo in signing details
2015-12-04 11:17:49 +00:00
Jimmy Cuadra
444fc5dbcd Fix typo in signing details. 2015-12-04 03:15:23 -08:00
Daniel Wagner-Hall
873b0dcecf Replace version numbers with release numbers 2015-12-04 11:09:35 +00:00
Daniel Wagner-Hall
63ca91f353 Move event signing to server-server spec
It's *definitely* not a client concern.

It isn't really in the right place at the moment, but s-s is very much a
work in progress whereas c-s is nearly stable.
2015-12-04 10:55:18 +00:00
Daniel Wagner-Hall
f308b7543c Specify /admin/whois/{userId} 2015-12-03 16:26:45 +00:00
Daniel Wagner-Hall
19ce17cfed Merge pull request #200 from matrix-org/daniel/redact
Merge pull request #200 from matrix-org/daniel/redact
2015-12-03 15:57:52 +00:00
Daniel Wagner-Hall
4baba85fe5 Draftify e2e in anticipation of a spec release 2015-12-03 11:52:11 +00:00
Daniel Wagner-Hall
2f3a00fe34 Consistently spell homeserver as homeserver 2015-12-02 19:23:33 +00:00
Daniel Wagner-Hall
e072d215cf Specify redaction 2015-12-02 15:27:25 +00:00
Matthew Hodgson
b946d39886 typo 2015-12-02 01:25:07 +00:00
Daniel Wagner-Hall
c05da871ca Merge pull request #194 from matrix-org/daniel/clarify
Merge pull request # 194 from matrix-org/daniel/clarify
2015-12-01 18:46:39 +00:00
Daniel Wagner-Hall
aa4ed10821 Unify v1 and v2 event schemas 2015-12-01 17:23:58 +00:00
Daniel Wagner-Hall
97fd1fdd62 Embed client and server release numbers
Note that this also removes the changelog - I'm going to re-add the
changelog differently soon.
2015-12-01 17:08:02 +00:00
Daniel Wagner-Hall
f6229f649a Remove confusing wording 2015-12-01 16:58:40 +00:00
Daniel Wagner-Hall
fd88be1830 Merge pull request #189 from matrix-org/daniel/sections
Merge pull request # 189 from matrix-org/daniel/sections
2015-12-01 16:43:17 +00:00
Daniel Wagner-Hall
c6e0322a9e Swaggerify /account 2015-12-01 13:53:03 +00:00
Daniel Wagner-Hall
c9c433bc15 Make section depths consistent 2015-11-30 14:31:24 +00:00
Daniel Wagner-Hall
6c66bfc755 Flatten out v1 and v2_alpha directories
As a side effect, I got rid of all of the horrible symlinks and just put
in all of the proper relative paths. Because the horrible symlinks were
horrible.
2015-11-30 11:22:57 +00:00
Daniel Wagner-Hall
b479b54cd8 Add tables of contents to individual specs 2015-11-27 18:52:58 +00:00
Daniel Wagner-Hall
e401d3e262 Merge pull request #184 from matrix-org/daniel/splitspec
Split spec into page-per-section
2015-11-27 16:46:06 +00:00
Daniel Wagner-Hall
e171acf01f Split spec into page-per-section 2015-11-27 16:45:47 +00:00
Daniel Wagner-Hall
bc514dc9c4 Merge pull request #178 from matrix-org/daniel/directory
Fix and include /directory api docs
2015-11-27 16:21:15 +00:00
Daniel Wagner-Hall
7f2813354d Swaggerify /ban 2015-11-27 15:42:21 +00:00
Mark Haines
a20a49abf6 Merge pull request #168 from matrix-org/markjh/client_config
Add API for setting client config
2015-11-27 15:32:21 +00:00
Mark Haines
c5f457cee9 Merge pull request #132 from matrix-org/markjh/room_tags
Document a v2 api for setting tags on rooms
2015-11-27 15:31:54 +00:00
Richard van der Hoff
d9130f0e13 Merge pull request #24 from matrix-org/markjh/end_to_end_encryption
Basic specification for key distribution for end-to-end cryptography.
2015-11-27 14:32:26 +00:00
Daniel Wagner-Hall
ad4d8ae7a6 Move client-server intro to client-server section 2015-11-27 13:50:24 +00:00
Richard van der Hoff
0b1ba70a32 fix rst markup
`` > `
2015-11-27 13:33:58 +00:00
Richard van der Hoff
2dbb8ba56c Fix title levels
make the title decoration consistent with the rest of the spec
2015-11-27 12:53:03 +00:00
Richard van der Hoff
51ca25a472 Merge branch 'master' into markjh/end_to_end_encryption 2015-11-27 11:49:11 +00:00
Richard van der Hoff
5f4458b2ff Merge branch 'master' into markjh/end_to_end_encryption 2015-11-27 11:45:49 +00:00
Richard van der Hoff
8d41536757 Address kegan's comments
Minor fixes to the e2e spec as raiseds by kegan
2015-11-27 11:37:24 +00:00
Daniel Wagner-Hall
5e30b5b8d7 Remove POST version of /send
PUT should always be used.
2015-11-26 16:46:29 +00:00
Daniel Wagner-Hall
c25a806cef Fix and include /directory api docs 2015-11-26 15:03:39 +00:00
Mark Haines
e76068a2a6 Merge branch 'markjh/room_tags' into markjh/client_config 2015-11-20 18:40:56 +00:00
Mark Haines
5bae15d47b Merge branch 'master' into markjh/room_tags
Conflicts:
	api/client-server/v2_alpha/sync.yaml
2015-11-20 18:39:15 +00:00
Richard van der Hoff
d8dd380dfa Merge pull request #164 from matrix-org/rav/SPEC-254
Fix /sync documentation, post SPEC-254
2015-11-20 15:17:55 +00:00
Mark Haines
032ee75537 Update specification wording to match s/config/account_data/ 2015-11-19 10:42:22 +00:00
Mark Haines
05c0092664 s/config/account_data/ 2015-11-19 10:38:22 +00:00
Paul Evans
e95a1616af Merge pull request #143 from matrix-org/paul/federation-room-join
Document the federation remote join handshake
2015-11-18 19:21:04 +00:00
Mark Haines
40f7eab73f s/private_user_data/account_data/ 2015-11-18 15:44:18 +00:00
Mark Haines
24c4b8b095 Merge branch 'markjh/room_tags' into markjh/client_config
Conflicts:
	api/client-server/v1/rooms.yaml
	api/client-server/v1/sync.yaml
	api/client-server/v2_alpha/sync.yaml
	specification/targets.yaml
2015-11-18 15:30:16 +00:00
Mark Haines
fcbb985073 s/private_user_data/account_data/ 2015-11-18 15:27:26 +00:00
Richard van der Hoff
6653362f31 Unflatten 'unsigned'
It turns out that flattening 'unsigned' comes with too many downsides. Let's
stick with the status quo.
2015-11-18 15:15:21 +00:00