Richard van der Hoff
427e0bb83b
make jenkins and travis use a common script
2017-11-14 19:19:58 +00:00
Richard van der Hoff
b0a17e957d
Merge pull request #1069 from matrix-org/dbkr/is_bulk_lookup
...
Spec IS bulk_lookup endpoint
2017-11-14 17:25:25 +00:00
David Baker
5147a3b975
Fix broken links & grammar
2017-11-14 17:14:56 +00:00
David Baker
45af878e11
Merge remote-tracking branch 'origin/master' into dbkr/is_bulk_lookup
2017-11-14 17:11:39 +00:00
David Baker
d728e67751
Merge pull request #1068 from matrix-org/dbkr/threepid_add_msisdn
...
Document threepids
2017-11-14 17:05:39 +00:00
David Baker
14df31458b
Attempt to clarify example a little
2017-11-14 15:39:25 +00:00
David Baker
9c5972ffe3
More formatting / grammar
2017-11-14 15:31:02 +00:00
Maxime Dor
836e6c81d1
Fix spelling
2017-11-14 15:15:49 +00:00
David Baker
e12c0b54ff
Formatting & grammar
2017-11-14 15:12:30 +00:00
David Baker
4526ff2ea6
Double backticks in rst :/
2017-11-14 15:11:30 +00:00
David Baker
1e4cba6b55
Don't linkify email addresses in examples
2017-11-14 15:10:11 +00:00
David Baker
3487f5d75a
Spell out what we mean by a 3pid
...
(and consequently rejig all the fixed-width formatting)
2017-11-14 15:08:56 +00:00
David Baker
ff85ec055e
Move 3pid types down
2017-11-14 15:07:22 +00:00
David Baker
8d557ec9dc
Actually this isn't necessary in this section
2017-11-14 15:05:58 +00:00
David Baker
e80675c9e9
Link in markdown, not swagger
2017-11-14 15:03:51 +00:00
David Baker
493b936209
Make these links more specific too
2017-11-14 15:01:58 +00:00
David Baker
b789f61522
Make link more specific
2017-11-14 14:58:30 +00:00
Maxime Dor
cdfff67878
Create spec for IS bulk lookup
2017-11-14 14:55:16 +00:00
Travis Ralston
0f5a4efce6
Spec URL previews ( #1064 )
...
* Spec URL previews
* Require authentication on /upload and /preview_url
2017-11-14 14:52:51 +00:00
David Baker
6edb90a08e
Document threepids
...
Adds the /msisdn' 3pid type and generally fleshes out what a 3pid
is and how they work.
This merges most of the work from Max Dor in https://github.com/matrix-org/matrix-doc/pull/1039
with some tweaks and additions.
2017-11-14 14:36:38 +00:00
Richard van der Hoff
202a265d85
Config for travis-ci
2017-11-14 13:12:38 +00:00
Richard van der Hoff
0cbf533625
Use petstore for continuserv swagger docs
...
Matrix.org's swagger browser is behind https, which means it can't read the
swagger from a continuserv on http. Use the petstore instead.
2017-11-14 13:02:43 +00:00
Richard van der Hoff
85340a9e00
Merge pull request #1063 from turt2live/travis/whoami
...
Spec /account/whoami
2017-11-14 09:54:49 +00:00
Travis Ralston
2468c38482
Add required property to whoami
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 18:47:38 -07:00
Travis Ralston
41db12713d
Update whoami endpoint
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 14:22:20 -07:00
Travis Ralston
9cf2b59f4e
Make it less obvious where this was copy/pasted from
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-12 23:56:28 -07:00
Travis Ralston
2b3c84503c
Add /account/whoami to changelog
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-12 23:54:47 -07:00
Travis Ralston
b1801ea6db
Spec /account/whoami
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-12 23:49:40 -07:00
Richard van der Hoff
88fb2e9abd
Merge pull request #1045 from maxidor/max/cs/unknow_filter_status
...
Add status for unknown user's filter ID
2017-11-09 18:29:12 +00:00
Richard van der Hoff
5697466a35
Merge pull request #1060 from maxidor/max/cs/sync-missing_event_id
...
Add missing optional key for sync format
2017-11-09 18:18:08 +00:00
Maxime Dor
099a7e90ae
Change return code following feedback
2017-11-09 15:32:32 +01:00
Maxime Dor
dcaaf84395
Be clear that event_id is not applicable everywhere
2017-11-09 15:28:44 +01:00
Maxime Dor
efa9b5a8f1
Add missing required key for sync format
2017-11-09 02:10:23 +01:00
Richard van der Hoff
3630e69c2e
s/bug/spec-bug
2017-11-08 09:06:50 +00:00
Richard van der Hoff
a38d4fc68e
Move templating into scripts dir
...
There's no real need for this to be at the top level.
2017-11-08 08:37:56 +00:00
Richard van der Hoff
d9285cf5b5
Updates to README and CONTRIBUTING
2017-11-08 08:14:20 +00:00
Richard van der Hoff
de6b0a278e
remove dead labels from README
...
'site' and 'projects' are no longer things.
2017-11-06 18:28:07 +00:00
Richard van der Hoff
e7772af5c3
Supporting-docs now in matrix.org repo.
2017-11-06 14:57:04 +00:00
Richard van der Hoff
17af66105d
Fix PR links in changelog
2017-11-06 12:34:59 +00:00
Richard van der Hoff
d20b258e8b
Merge pull request #1047 from uhoreg/e2e
...
add information on handling redacted e2e events and detecting replay attacks
2017-11-06 12:22:01 +00:00
Richard van der Hoff
ab8a85a41f
Merge pull request #1058 from maxidor/max/appendices/canonical_json-test_data
...
Add explicit examples for JSON encoding
2017-11-06 10:25:39 +00:00
Matthew Hodgson
18f558f065
remove old docker repo
2017-11-05 00:40:22 +00:00
Maxime Dor
68e12feec7
Add explicit examples for JSON encoding
2017-11-05 01:14:44 +01:00
Richard van der Hoff
1584e0f1df
Merge pull request #1055 from matrix-org/rav/clean_up_event_schema
...
Clean up event schema processing
2017-11-03 17:29:07 +00:00
Richard van der Hoff
fbd2b22c71
Inherit 'required' correctly
2017-11-03 17:24:53 +00:00
Richard van der Hoff
e5e249dce1
Remove redundant 'Required' annotations from event fields
2017-11-03 17:17:59 +00:00
Richard van der Hoff
51e248a1db
Rename 'type' field to 'title'
...
: because that better reflects the underlying schema ("type" is one of
object/string/etc).
2017-11-03 17:13:56 +00:00
Richard van der Hoff
c058dd5c3f
Use standard logic to parse core event schemas
...
Use process_data_type rather than reinventing our own wheel; doing so means
that the 'Required' fields are correctly annotated as such.
2017-11-03 16:50:38 +00:00
Richard van der Hoff
1fdd8bb183
Fix some trailing whitespace
2017-11-03 16:32:06 +00:00
Richard van der Hoff
93ff0713cb
make res_headers a TypeTable
...
... rather than a list of rows
2017-11-03 16:31:41 +00:00