Commit graph

2996 commits

Author SHA1 Message Date
Daniel Wagner-Hall 9c733a45e8 Take object, not bool, as param
Throughout our API we take objects. And swagger is unhappy with not
doing so.
2015-12-04 17:36:19 +00:00
Daniel Wagner-Hall 614ee9ea1b Move application service swagger out of c-s dir 2015-12-04 17:34:48 +00:00
Mark Haines 140206ca69 s/archived/leave/ 2015-12-04 17:32:59 +00:00
Richard van der Hoff 2c6de16779 Merge pull request #206 from matrix-org/rav/serve_drafts
Make the speculator serve the spec from drafts branches.
2015-12-04 17:03:34 +00:00
Richard van der Hoff 1b7548d460 Make the speculator serve the spec from drafts branches. 2015-12-04 17:03:33 +00:00
Mark Haines 79d109f7cc Add an flag to control whether rooms the user has left are included in the sync 2015-12-04 16:44:11 +00:00
Daniel Wagner-Hall 8c32627751 Merge pull request #201 from matrix-org/daniel/statekeys
Explicitly document /rooms/{roomId}/state/{eventType} without state key
2015-12-04 11:42:21 +00:00
Daniel Wagner-Hall e0ebabf8cc Explicitly document /rooms/{roomId}/state/{eventType} without state key 2015-12-04 11:42:19 +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 63306a593b Merge pull request #197 from matrix-org/daniel/versionnumbers
Replace version numbers with release numbers
2015-12-04 11:09:43 +00:00
Daniel Wagner-Hall 873b0dcecf Replace version numbers with release numbers 2015-12-04 11:09:35 +00:00
Daniel Wagner-Hall 8c874176d2 Merge pull request #204 from matrix-org/daniel/movesigning
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:20 +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 690a40c240 Merge pull request #198 from matrix-org/daniel/whois
Specify /admin/whois/{userId}
2015-12-03 16:27:28 +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 664415732f Merge pull request #203 from matrix-org/daniel/kille2e
Draftify e2e in anticipation of a spec release
2015-12-03 11:52:13 +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
Daniel Wagner-Hall 138c8f88be Merge pull request #199 from matrix-org/daniel/fixcontinuserv
continuserv: serve multiple paths
2015-12-02 15:06:55 +00:00
Daniel Wagner-Hall 1ce3357927 continuserv: serve multiple paths 2015-12-02 14:57:28 +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 3bbb2a2894 Merge pull request #196 from matrix-org/daniel/unifyevents
Remove obsolete documentation
2015-12-01 18:30:43 +00:00
Daniel Wagner-Hall 7f07da4b50 Remove obsolete documentation 2015-12-01 17:29:09 +00:00
Daniel Wagner-Hall 974792282d Merge pull request #192 from matrix-org/daniel/unifyevents
Unify v1 and v2 event schemas
2015-12-01 17:24:00 +00:00
Daniel Wagner-Hall aa4ed10821 Unify v1 and v2 event schemas 2015-12-01 17:23:58 +00:00
Daniel Wagner-Hall d2185d11df Merge pull request #195 from matrix-org/daniel/versionnumbers
Embed client and server release numbers
2015-12-01 17:15: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 bcead3b0a5 Merge pull request #193 from matrix-org/daniel/voipendpoint
Fix turnServer endpoint
2015-12-01 16:58:47 +00:00
Daniel Wagner-Hall f6229f649a Remove confusing wording 2015-12-01 16:58:40 +00:00
Daniel Wagner-Hall 681c258206 Fix turnServer endpoint 2015-12-01 16:56:28 +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 ebed3b60bd Add trailing slashes to links 2015-12-01 15:58:15 +00:00
Erik Johnston ca7ef1b536 Update Results description 2015-12-01 15:34:25 +00:00
Erik Johnston 5e8bb34f36 Change the results dict to a list 2015-12-01 15:33:13 +00:00
Erik Johnston 23b2497743 Expand on where pagination tokens can be returned 2015-12-01 15:31:35 +00:00
Erik Johnston 46fd0b252c Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/search_yet_agian 2015-12-01 15:06:13 +00:00
Daniel Wagner-Hall a4668c1d8c Fix typo 2015-12-01 14:21:20 +00:00
Daniel Wagner-Hall 611e2be229 Merge pull request #191 from matrix-org/daniel/fixspeculator
302 to spec/head/index.html rather than serving it on /spec/head

Otherwise relative links are broken
2015-12-01 14:19:36 +00:00
Daniel Wagner-Hall c4eaf7458f 302 to spec/head/index.html rather than serving it on /spec/head
Otherwise relative links are broken
2015-12-01 14:19:31 +00:00
Daniel Wagner-Hall 74cbb7f8f5 Merge pull request #190 from matrix-org/daniel/swaggeradmin
Swaggerify /account
2015-12-01 13:53:05 +00:00
Daniel Wagner-Hall c6e0322a9e Swaggerify /account 2015-12-01 13:53:03 +00:00
Daniel Wagner-Hall 79244e8065 Remove redundant node event schema checker
The python one does the same
2015-11-30 16:40:48 +00:00
Daniel Wagner-Hall c9c433bc15 Make section depths consistent 2015-11-30 14:31:24 +00:00
Daniel Wagner-Hall ea2ce4b28b Merge pull request #185 from matrix-org/daniel/flattenapis
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:23:00 +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 1a4a9af9a7 Merge pull request #187 from matrix-org/daniel/fixup
Merge pull request # 187 from matrix-org/daniel/fixup
2015-11-30 11:15:16 +00:00