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
Daniel Wagner-Hall
4faede73a1
Merge branch 'master' into daniel/multipleexamples
2015-11-25 14:29:33 +00:00
Daniel Wagner-Hall
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
2015-11-23 18:35:55 +00:00
Daniel Wagner-Hall
6a6cbd9d24
Always try to build continuserv & speculator on jenkins
2015-11-23 18:32:10 +00:00
Daniel Wagner-Hall
c432396079
Add comment
2015-11-23 17:26:32 +00:00
Daniel Wagner-Hall
866fa58276
Rename
2015-11-23 17:22:53 +00:00
Daniel Wagner-Hall
e045f28b44
Pull out constant for permissions
...
Also, drop permissions from 0755 to 0700
2015-11-23 17:20:54 +00:00
Oddvar Lovaas
24356d864e
Merge pull request #176 from matrix-org/daniel/gendoc
...
Tweaks to spec generation for matrix.org
2015-11-23 10:28:51 +00:00
Oddvar Lovaas
092ff1370a
Merge pull request #175 from matrix-org/daniel/genimprovements
...
Add anchors to spec
2015-11-23 10:28:01 +00:00
Mark Haines
5ccc39b850
Say that type is an event type
2015-11-20 18:45:09 +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
181d3f976d
Initial proposal for websockets support.
2015-11-20 15:29:54 +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
Richard van der Hoff
e7610c7cc5
Merge pull request #165 from matrix-org/rav/flatten_sync
...
/sync response format tweaks
2015-11-20 15:17:34 +00:00
Daniel Wagner-Hall
4ac85997f5
Fix check
2015-11-19 18:16:02 -05:00
