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
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
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
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
30ed918633
speculator: Allow spec viewing for multi-page spec
2015-11-27 16:45:53 +00:00
Daniel Wagner-Hall
e171acf01f
Split spec into page-per-section
2015-11-27 16:45:47 +00:00
Daniel Wagner-Hall
3951785f19
Fix alias path
2015-11-27 16:23:31 +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
Paul Evans
eb61f018c2
Merge pull request #144 from matrix-org/paul/small-fixes
...
Don't mark 'aliases' on m.room.canonical_alias as required
2015-11-27 15:42:36 +00:00
Daniel Wagner-Hall
ad8f4d37f4
Merge pull request #180 from matrix-org/daniel/ban
...
Swaggerify /ban
2015-11-27 15:42:23 +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
Daniel Wagner-Hall
9c449e29b8
Merge pull request #179 from matrix-org/daniel/generateswagger
...
Generate API docs from swagger
2015-11-27 15:03:24 +00:00
Daniel Wagner-Hall
f0c99a6925
Generate API docs from swagger
2015-11-27 15:03:22 +00:00
Richard van der Hoff
9fb26f7c85
Merge pull request #163 from matrix-org/rav/rework_objects
...
Updates to swagger table generation
2015-11-27 14:32:56 +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
Kegsay
e961390f44
Merge pull request #183 from matrix-org/daniel/moveintro
...
Merge pull request # 183 from matrix-org/daniel/moveintro
2015-11-27 13:53:55 +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
1e27b104dd
Merge pull request #182 from matrix-org/rav/speculator_text_errors
...
Make the speculator serve up errors as plain text
2015-11-27 12:04:19 +00:00
Richard van der Hoff
2aa4773cc1
Make the speculator serve up errors as plain text
...
... so that they are legible.
2015-11-27 12:01: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
e630f6c0c0
Merge pull request #181 from matrix-org/daniel/requireput
...
Merge pull request #181 from matrix-org/daniel/requireput
2015-11-27 10:05:21 +00:00
Mark Haines
c539b208f9
Merge branch 'markjh/room_tags' into markjh/client_config
...
Conflicts:
api/client-server/v2_alpha/sync.yaml
2015-11-26 16:56:39 +00:00
Mark Haines
d39494b6df
Fix typo in sync example
2015-11-26 16:55:12 +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
Daniel Wagner-Hall
604f78413f
Merge pull request #177 from matrix-org/daniel/matrixorgstyle
...
speculator: allow styling like matrix.org
2015-11-26 12:04:39 +00:00
Daniel Wagner-Hall
ec31c0f518
speculator: allow styling like matrix.org
2015-11-26 12:04:37 +00:00
Mark Haines
4e42aab245
Fix up the multi-hash ratchet thing
2015-11-25 15:13:13 +00:00
Kegsay
b0d7302ea5
Merge pull request #137 from matrix-org/daniel/multipleexamples
...
Daniel/multipleexamples
2015-11-25 15:09:43 +00:00
