46fd0b252c
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/search_yet_agian
9 years ago
a4668c1d8c
Fix typo
9 years ago
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
9 years ago
c4eaf7458f
302 to spec/head/index.html rather than serving it on /spec/head
...
Otherwise relative links are broken
9 years ago
74cbb7f8f5
Merge pull request #190 from matrix-org/daniel/swaggeradmin
...
Swaggerify /account
9 years ago
c6e0322a9e
Swaggerify /account
9 years ago
79244e8065
Remove redundant node event schema checker
...
The python one does the same
9 years ago
c9c433bc15
Make section depths consistent
9 years ago
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.
9 years ago
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.
9 years ago
1a4a9af9a7
Merge pull request #187 from matrix-org/daniel/fixup
...
Merge pull request # 187 from matrix-org/daniel/fixup
9 years ago
b479b54cd8
Add tables of contents to individual specs
9 years ago
e401d3e262
Merge pull request #184 from matrix-org/daniel/splitspec
...
Split spec into page-per-section
9 years ago
30ed918633
speculator: Allow spec viewing for multi-page spec
9 years ago
e171acf01f
Split spec into page-per-section
9 years ago
3951785f19
Fix alias path
9 years ago
bc514dc9c4
Merge pull request #178 from matrix-org/daniel/directory
...
Fix and include /directory api docs
9 years ago
eb61f018c2
Merge pull request #144 from matrix-org/paul/small-fixes
...
Don't mark 'aliases' on m.room.canonical_alias as required
9 years ago
ad8f4d37f4
Merge pull request #180 from matrix-org/daniel/ban
...
Swaggerify /ban
9 years ago
7f2813354d
Swaggerify /ban
9 years ago
a20a49abf6
Merge pull request #168 from matrix-org/markjh/client_config
...
Add API for setting client config
9 years ago
c5f457cee9
Merge pull request #132 from matrix-org/markjh/room_tags
...
Document a v2 api for setting tags on rooms
9 years ago
9c449e29b8
Merge pull request #179 from matrix-org/daniel/generateswagger
...
Generate API docs from swagger
9 years ago
f0c99a6925
Generate API docs from swagger
9 years ago
9fb26f7c85
Merge pull request #163 from matrix-org/rav/rework_objects
...
Updates to swagger table generation
9 years ago
d9130f0e13
Merge pull request #24 from matrix-org/markjh/end_to_end_encryption
...
Basic specification for key distribution for end-to-end cryptography.
9 years ago
e961390f44
Merge pull request #183 from matrix-org/daniel/moveintro
...
Merge pull request # 183 from matrix-org/daniel/moveintro
9 years ago
ad4d8ae7a6
Move client-server intro to client-server section
9 years ago
0b1ba70a32
fix rst markup
...
`` > `
9 years ago
2dbb8ba56c
Fix title levels
...
make the title decoration consistent with the rest of the spec
9 years ago
1e27b104dd
Merge pull request #182 from matrix-org/rav/speculator_text_errors
...
Make the speculator serve up errors as plain text
9 years ago
2aa4773cc1
Make the speculator serve up errors as plain text
...
... so that they are legible.
9 years ago
51ca25a472
Merge branch 'master' into markjh/end_to_end_encryption
9 years ago
5f4458b2ff
Merge branch 'master' into markjh/end_to_end_encryption
9 years ago
8d41536757
Address kegan's comments
...
Minor fixes to the e2e spec as raiseds by kegan
9 years ago
e630f6c0c0
Merge pull request #181 from matrix-org/daniel/requireput
...
Merge pull request #181 from matrix-org/daniel/requireput
9 years ago
c539b208f9
Merge branch 'markjh/room_tags' into markjh/client_config
...
Conflicts:
api/client-server/v2_alpha/sync.yaml
9 years ago
d39494b6df
Fix typo in sync example
9 years ago
5e30b5b8d7
Remove POST version of /send
...
PUT should always be used.
9 years ago
c25a806cef
Fix and include /directory api docs
9 years ago
604f78413f
Merge pull request #177 from matrix-org/daniel/matrixorgstyle
...
speculator: allow styling like matrix.org
9 years ago
ec31c0f518
speculator: allow styling like matrix.org
9 years ago
4e42aab245
Fix up the multi-hash ratchet thing
9 years ago
b0d7302ea5
Merge pull request #137 from matrix-org/daniel/multipleexamples
...
Daniel/multipleexamples
9 years ago
4faede73a1
Merge branch 'master' into daniel/multipleexamples
9 years ago
cc4869e68a
Merge pull request #174 from matrix-org/daniel/speculatorhardening
...
Several improvements to speculator to prepare it for actually being used by the masses, not just us devs
9 years ago
6a6cbd9d24
Always try to build continuserv & speculator on jenkins
9 years ago
c432396079
Add comment
9 years ago
866fa58276
Rename
9 years ago
e045f28b44
Pull out constant for permissions
...
Also, drop permissions from 0755 to 0700
9 years ago
Erik Johnston