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
Daniel Wagner-Hall
48aab7bad9
Return room avatar URLs in /publicRooms
2016-01-06 18:00:21 +00:00
Daniel Wagner-Hall
acc6dfed68
Merge pull request #250 from matrix-org/daniel/versionsyo
...
Add /_matrix/versions to spec
2016-01-06 17:43:23 +00:00
Daniel Wagner-Hall
5e30d75ccb
Add /_matrix/versions to spec
2016-01-06 17:43:20 +00:00
Daniel Wagner-Hall
ae7a1f2e6c
Merge pull request #249 from matrix-org/daniel/purgeguestaccesswithallkindsoffire
...
Remove mention that /sync takes an inline filter
2016-01-06 15:52:44 +00:00
Daniel Wagner-Hall
713415015b
Remove mention that /sync takes an inline filter
2016-01-06 15:51:07 +00:00
Daniel Wagner-Hall
0ea088320d
Merge pull request #248 from matrix-org/daniel/guestaccess
...
Tidy up guest access spec
* Mention that /leave is allowed
* Mention that /sync is allowed
* Re-order such that the whole list of APIs fits on one screen
2016-01-05 18:07:46 +00:00
Daniel Wagner-Hall
40b76c0364
Merge pull request #241 from matrix-org/daniel/kegandrafts
...
Delete old drafts
This information is now either in the spec, or complete lies
2016-01-05 18:07:13 +00:00
Daniel Wagner-Hall
d3f05ae49a
Guests can upgrade to regular accounts
2016-01-05 17:30:55 +00:00
Daniel Wagner-Hall
ca67aa7b4f
Tidy up guest access spec
...
* Mention that /leave is allowed
* Mention that /sync is allowed
* Re-order such that the whole list of APIs fits on one screen
2016-01-05 13:45:04 +00:00
Erik Johnston
70a6bef580
Merge pull request #247 from matrix-org/erikj/create_room_3pid_invite
...
Support 3pid invites in /createRoom
2016-01-05 11:30:37 +00:00
Erik Johnston
48f56bfbfb
Support 3pid invites in /createRoom
2016-01-05 10:52:47 +00:00
Daniel Wagner-Hall
1eee36e889
Merge pull request #232 from matrix-org/daniel/deprecatestuff
...
Deprecated deprecated APIs
2016-01-05 10:44:41 +00:00
Daniel Wagner-Hall
8fd6ea58ba
Merge pull request #239 from matrix-org/daniel/mroommemberstates
...
Explain what the room member states mean
2016-01-05 10:44:20 +00:00
Matthew Hodgson
c7d11335cf
Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc
2016-01-05 02:48:14 +00:00
Matthew Hodgson
691d9ba664
typo :(
2016-01-05 02:47:55 +00:00
Mark Haines
f648360f5d
Merge pull request #246 from matrix-org/markjh/room_filter
...
Add top level filters for filtering by room id.
2015-12-23 10:45:37 +00:00
Paul Evans
c9ecfa7643
Merge pull request #242 from matrix-org/paul/federation
...
Don't need to document /pdu/ any more
2015-12-22 13:48:42 +00:00
Mark Haines
559c0eb344
Merge pull request #245 from matrix-org/markjh/account_data_filters
...
Document filtering for account data
2015-12-22 11:52:22 +00:00
Mark Haines
52bb20b142
Document filtering for account data
2015-12-22 11:52:19 +00:00
Mark Haines
4c43939977
more backticks
2015-12-22 11:48:11 +00:00
Mark Haines
9b4a37f57b
backticks
2015-12-22 11:44:05 +00:00
Mark Haines
288c7ed353
Add top level filters for filtering by room id.
2015-12-21 20:44:06 +00:00
