Commit graph

1410 commits

Author SHA1 Message Date
Richard van der Hoff
58b346e204 s/user_id/sender/ in context example response 2016-02-01 17:50:36 +00:00
Richard van der Hoff
b2e0a855cc Add 'event' to event context API
also link through to the event schemas
2016-02-01 17:45:45 +00:00
Daniel Wagner-Hall
2ed95a9a40 Merge pull request #267 from matrix-org/daniel/3pid
Specify login behaviour for unknown 3pids
2016-01-29 16:58:10 +00:00
Daniel Wagner-Hall
0da26cd7e1 Specify login behaviour for unknown 3pids 2016-01-29 16:49:54 +00:00
Mark Haines
f291484709 Merge pull request #265 from matrix-org/markjh/3pid_login
Add 3pid password login to the spec
2016-01-29 15:42:21 +01:00
Mark Haines
245e8e8571 Add 3pid password login to the spec 2016-01-29 14:42:18 +00:00
Mark Haines
72d859609a Merge pull request #266 from matrix-org/markjh/three_pid_creds
Fix the key name to be three_pid_creds rather than threePidCreds
2016-01-29 15:39:41 +01:00
Mark Haines
e7f80b7c71 Fix the key name to be three_pid_creds rather than threePidCreds 2016-01-29 13:00:59 +00:00
Daniel Wagner-Hall
9d1fc97505 Merge pull request #264 from matrix-org/daniel/unban
Require explicit un-banning
2016-01-15 14:08:44 +00:00
Daniel Wagner-Hall
2e46b587b8 Require explicit un-banning 2016-01-15 14:08:40 +00:00
David Baker
c69481d67a Merge pull request #263 from matrix-org/invalid_user_name
Add an error code for invalid user names.
2016-01-15 13:30:02 +00:00
David Baker
169cc98101 M_INVALID_USERNAME to be consistent with the name of the parameter 2016-01-15 10:04:29 +00:00
David Baker
2301a792d7 Add an error code for invalid user names. 2016-01-14 17:19:04 +00:00
Daniel Wagner-Hall
bd348b6810 Merge pull request #262 from matrix-org/daniel/asid
Add ID to application services
2016-01-14 11:05:58 +00:00
Matthew Hodgson
cfbb695fd3 typoe 2016-01-13 18:25:33 +00:00
Daniel Wagner-Hall
9bc07ea093 Add ID to application services 2016-01-13 16:04:01 +00:00
Daniel Wagner-Hall
5cf22c210e Merge pull request #261 from matrix-org/daniel/join
/join and /room/:roomId/join aren't exact aliases

Separate them, clarify their differences.

Also, fix some links which weren't being properly populated.
2016-01-13 15:55:54 +00:00
Daniel Wagner-Hall
1e2b63763e /join and /room/:roomId/join aren't exact aliases
Separate them, clarify their differences.

Also, fix some links which weren't being properly populated.
2016-01-13 15:55:51 +00:00
Richard van der Hoff
367e1334eb Merge pull request #260 from matrix-org/rav/start_0.0.2
Start development on next spec version
2016-01-11 16:01:23 +00:00
Richard van der Hoff
91fa78eb53 Start development on next spec version 2016-01-11 15:52:08 +00:00
Richard van der Hoff
e6af0441e1 Final r0.0.1 changelog entries 2016-01-11 15:29:35 +00:00
Richard van der Hoff
00d10dd630 Merge pull request #257 from matrix-org/rav/body_params_in_tables
Display POST body parameters as tables
2016-01-11 15:24:04 +00:00
Richard van der Hoff
7a244ff977 Merge branch 'master' into rav/body_params_in_tables
Conflicts:
	templating/matrix_templates/units.py
2016-01-11 14:36:28 +00:00
Richard van der Hoff
b8669609a0 Merge pull request #255 from matrix-org/rav/refactor_schema_logic
Refactor a bunch of the logic in matrix_templates/units.py
2016-01-11 14:27:04 +00:00
Richard van der Hoff
18570126b5 Merge pull request #259 from matrix-org/rav/doc_speedups
Speed up gendoc.py by only running build.py once
2016-01-11 14:20:26 +00:00
Richard van der Hoff
87f2f9e878 Fix review comments 2016-01-11 14:19:53 +00:00
Richard van der Hoff
6265d6ce06 Merge pull request #254 from matrix-org/rav/filter_spec
Add some missing titles to the filter upload spec
2016-01-11 12:59:38 +00:00
Richard van der Hoff
78e0da50fe Merge pull request #256 from matrix-org/rav/r0.0.1
Add a changelog for r0.0.1
2016-01-11 12:59:00 +00:00
Richard van der Hoff
077cf661e7 Merge pull request #258 from matrix-org/rav/no_sort_props
Don't sort the properties in object schemas
2016-01-11 12:58:46 +00:00
Richard van der Hoff
972153be4f Fix endpoint path for /context
s/api//
2016-01-08 14:06:53 +00:00
Richard van der Hoff
cff1b4ae35 Merge pull request #251 from matrix-org/daniel/guestshiz
Clarify guest /events and /sync
2016-01-08 00:47:57 +00:00
Richard van der Hoff
1f6c4d5bb2 Speed up gendoc.py by only running build.py once 2016-01-08 00:40:03 +00:00
Richard van der Hoff
4bdfd3d492 Fix 'required' annotations
We lost some required annotations. Add them back in.
2016-01-07 23:52:52 +00:00
Richard van der Hoff
f438644ec3 Don't sort the properties in object schemas
It makes more sense for us to order the properties manually in the yaml file,
rather than forcing their alphabeticising.
2016-01-07 23:40:18 +00:00
Matthew Hodgson
411ab64712 fix misnamed key in example; thanks SkaveRat 2016-01-07 23:15:33 +00:00
Richard van der Hoff
93eb6fb352 another diff noise fix 2016-01-07 22:46:22 +00:00
Richard van der Hoff
71b6ea8578 Fix a couple of things which were giving noisy diffs 2016-01-07 22:32:01 +00:00
Richard van der Hoff
c6f5ba09d4 Display POST body parameters as tables
Replace a whole bunch of special-casing for POST body parameters with the same
logic as is used for response objects: represent all but the top-level as
tables.
2016-01-07 22:19:30 +00:00
Richard van der Hoff
9a5673a1cc Reinstate event type info
The 'typeof' info on the events was perpetrated by a fearsome hack which I
broke. I don't want to fix it any better right now, so just make the hack work
and pull the rug over.
2016-01-07 21:45:10 +00:00
Richard van der Hoff
e22135c099 Add a changelog for r0.0.1 2016-01-07 19:25:40 +00:00
Richard van der Hoff
d17c84b819 Fix a missed call to get_tables_for_schema 2016-01-07 19:12:14 +00:00
Richard van der Hoff
9f9b3a1fdd Refactor a bunch of the logic in matrix_templates/units.py
Move 'inherit_parents' calls up to before get_json_schema_object_fields so that
things can inherit their types via allOf declarations. Also make it possible to
inherit descriptions.

Remove redundant 'include_parents' parameter, which was never used.

Move 'resolve_references' call out of get_tables_for_schema (it was redundant
sometimes and not others, and now it is clearer who has responsibility for it)
2016-01-07 18:59:13 +00:00
Richard van der Hoff
42cade36e6 Merge remote-tracking branch 'origin/master' into rav/filter_spec 2016-01-07 18:44:07 +00:00
Richard van der Hoff
ff26e0dc48 Add some missing titles to the filter upload spec 2016-01-07 18:31:09 +00:00
Daniel Wagner-Hall
3edff684a1 Merge pull request #253 from matrix-org/daniel/guestupgrade
Guests can upgrade to regular accounts
2016-01-07 16:39:35 +00:00
Daniel Wagner-Hall
7b19262525 Merge pull request #252 from matrix-org/daniel/asreg
Fix param name
2016-01-07 13:57:55 +00:00
Daniel Wagner-Hall
f6b1b80678 Fix param name 2016-01-07 13:18:19 +00:00
Daniel Wagner-Hall
0e967edfd9 Fix thinko 2016-01-07 12:38:32 +00:00
Daniel Wagner-Hall
7d9547274c Clarify guest /events and /sync 2016-01-07 11:59:38 +00:00
Daniel Wagner-Hall
3dc7eb23fa Merge pull request #244 from matrix-org/daniel/avatarurls
Return room avatar URLs in /publicRooms
2016-01-06 18:00:32 +00:00