wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1028 commits 4 branches 0 tags 17 MiB
Commit graph

1028 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff
838af2a23e Updates to swagger table generation 
A bunch of related fixes to the code for parsing the state and API yaml files:

1. Some of our objects are {key: {key: value}} - style nested key/value
   dictionaries. Handle this by refactoring get_json_schema_object_fields so
   that such objects are handled wherever they appear, rather than when they
   are just subproperties of a 'proper' object.

2. Fix multi-level inheritance (so an object can have an 'allOf' property which
   can successfully refer to an object which itself has an 'allOf' property).

3. $ref fields in event schemas weren't being expanded correctly

4. sort type tables breadth-first rather than depth-first so that the ordering
   in complex structures like the /sync response makes a bit more sense.
 2015-11-15 23:44:46 +00:00
Daniel Wagner-Hall
ea364a108b Merge pull request #161 from matrix-org/daniel/guestdisplaynames 
Merge pull request #161 from matrix-org/daniel/guestdisplaynames

Guests are allowed to set displaynames
 2015-11-12 13:23:49 +00:00
Daniel Wagner-Hall
c5e4d08e3b Merge pull request #158 from matrix-org/daniel/guestroominitialsync 
Merge pull request #158 from matrix-org/daniel/guestroominitialsync

Guest users are allowed room initialSync
 2015-11-12 13:20:39 +00:00
Daniel Wagner-Hall
29d9c8eec6 Guests are allowed to set displaynames 2015-11-12 12:05:02 +00:00
Daniel Wagner-Hall
061105c9dc Guest users are allowed room initialSync 2015-11-11 17:18:58 +00:00
Daniel Wagner-Hall
703b9d456b Merge pull request #157 from matrix-org/daniel/specfetch 
speculator: Nessle up some more if statements
 2015-11-11 15:25:04 +00:00
Daniel Wagner-Hall
0f0359d9c1 speculator: Nessle up some more if statements 2015-11-11 15:13:34 +00:00
Daniel Wagner-Hall
567ba6d22d Merge pull request #156 from matrix-org/daniel/specfetch 
speculator: Fetch before deciding head is fresh
 2015-11-11 15:11:51 +00:00
Daniel Wagner-Hall
740cc66a7c speculator: Fetch before deciding head is fresh 2015-11-11 14:01:45 +00:00
Daniel Wagner-Hall
a80fcfa83b Merge pull request #155 from matrix-org/daniel/publicwritable2 
Specify /publicRooms world_readable and guest_access

Depends on https://github.com/matrix-org/matrix-doc/pull/154
 2015-11-11 11:53:37 +00:00
Daniel Wagner-Hall
dcf54e11b1 Specify /publicRooms world_readable and guest_access 
Depends on https://github.com/matrix-org/matrix-doc/pull/154
 2015-11-11 11:53:31 +00:00
Daniel Wagner-Hall
b6a4dfa7cd Merge pull request #154 from matrix-org/daniel/publicwritable 
Specify /publicRooms
 2015-11-11 11:39:42 +00:00
Daniel Wagner-Hall
d7357ef9b7 Specify /publicRooms 2015-11-11 11:39:40 +00:00
Daniel Wagner-Hall
27ffe7bacd Don't serve rst diffs as HTML 2015-11-10 15:35:10 +00:00
Daniel Wagner-Hall
624756fb9a Merge pull request #153 from matrix-org/daniel/3pidyetagain 
3pid invites: remove mentions of display_name
 2015-11-10 12:44:13 +00:00
Daniel Wagner-Hall
bdf755632e Merge pull request #152 from matrix-org/daniel/macaroons 
Document macaroon type=login
 2015-11-10 12:43:36 +00:00
Kegsay
c8f6ed1107 More formatting.. 2015-11-10 11:31:31 +00:00
Kegsay
51fe4a90b6 More formatting fixes 2015-11-10 11:28:27 +00:00
Kegsay
c1866ebebc Fix table formatting 2015-11-10 11:26:06 +00:00
Daniel Wagner-Hall
24c2036a35 3pid invites: remove mentions of display_name 2015-11-09 17:30:18 +00:00
Daniel Wagner-Hall
68bec3a61a Merge pull request #151 from matrix-org/daniel/continuservconcurrency 
continuserv: guard concurrent accesses to wg
 2015-11-09 16:11:56 +00:00
Daniel Wagner-Hall
c3608b3a69 Merge branch 'master' into daniel/continuservconcurrency 
Conflicts:
	scripts/continuserv/main.go
 2015-11-09 16:11:34 +00:00
Daniel Wagner-Hall
436a35e9f6 Document macaroon type=login 2015-11-09 16:04:31 +00:00
Daniel Wagner-Hall
e72151f2c3 Specify guest room access 
This was reviewed as PR #150 and merged from daniel/anonymousaccess
 2015-11-06 18:15:21 +00:00
Daniel Wagner-Hall
16b91086b0 Merge pull request #149 from matrix-org/daniel/continuservcontenttype 
continuserv: set Content-Type header
 2015-11-06 17:26:58 +00:00
Daniel Wagner-Hall
bbf9e229a7 continuserv: guard concurrent accesses to wg 2015-11-06 16:09:09 +00:00
Daniel Wagner-Hall
1be5b856bd Preserve text/plain for errors 
Newlines are nice
 2015-11-06 16:05:07 +00:00
Daniel Wagner-Hall
7f6eafdce5 continuserv: set Content-Type header 2015-11-06 14:46:55 +00:00
Daniel Wagner-Hall
cfdcf9e5a3 Merge pull request #148 from matrix-org/daniel/leadingspacesucks 
speculator: Send Content-Type: text/html header
 2015-11-06 11:46:41 +00:00
Daniel Wagner-Hall
937ff046d8 Force / to be HTML too 2015-11-05 19:21:16 +00:00
Daniel Wagner-Hall
559747e77a speculator: Sent Content-Type: text/html header 
Go is auto-detecting that this is XML (because for some reason we
generate XHTML), and serving it with a Content-Type header text/xml.

This causes the browser to render it as XHTML, which gives interesting
quirks like extra newlines.

This forces the browser to interpret it as HTML.

What we should probably do instead of stop generating XHTML and start
generating HTML. But in the mean time, this will fix the rendering
issues.
 2015-11-05 19:18:28 +00:00
Daniel Wagner-Hall
161441fa3a Update 3pid spec based on new implementation 2015-11-05 18:11:20 +00:00
Daniel Wagner-Hall
232b10b0f6 Merge branch 'master' of github.com:matrix-org/matrix-doc 2015-11-05 13:25:51 +00:00
Richard van der Hoff
8cba11b1cd Add some links to spec bugs for display names 
Just added a couple of TODO comments to useful jira bugs
 2015-11-05 11:06:31 +00:00
Richard van der Hoff
2fd5fc39a0 Add spec for calculating display names for rooms and users 
Merged from https://github.com/matrix-org/matrix-doc/pull/145
 2015-11-05 10:55:11 +00:00
Mark Haines
b7cc5b1018 Merge pull request #141 from matrix-org/markjh/full_http_api_docs 
Include the full schema for an http API in the docs
 2015-11-04 16:03:22 +00:00
Mark Haines
3b7ad9a11f Merge pull request #146 from matrix-org/markjh/syntax_highlighting_message_examples 
Enable syntax highlighting for message type examples
 2015-11-04 16:02:34 +00:00
Mark Haines
c719946370 Enable syntax highlighting for message type examples 2015-11-04 11:51:50 +00:00
Mark Haines
8070489080 Handle lists of types in arrays 2015-11-04 11:44:20 +00:00
Mark Haines
e49ea9015f Deduplicate tables with the same title 2015-11-04 11:39:36 +00:00
Mark Haines
8322151661 Don't put a space when appending the "Must be" strings to the desciption if there isn't a description, otherwise it will mess up the indent 2015-11-03 19:42:49 +00:00
Mark Haines
ebc0237109 Add the missing titles to the schema 2015-11-03 19:35:44 +00:00
Mark Haines
55f1602741 Merge pull request #140 from matrix-org/markjh/v2_sync_prev_content 
Document the differences in event formatting between the v1 and v2 event format.
 2015-11-02 15:53:37 +00:00
Daniel Wagner-Hall
2e3a0b4e00 Specify guest accounts 2015-11-02 15:26:06 +00:00
Mark Haines
91eb25b76d Include the full schema for an http API in the docs by resolving references to other files 2015-10-30 15:45:46 +00:00
Mark Haines
d297d83151 Mention that sender is renamed to user_id in v1 2015-10-29 18:45:53 +00:00
Mark Haines
451801bf38 Add an example of `prev_content in unsigned` to v2 /sync 2015-10-29 18:40:05 +00:00
Mark Haines
d067e50af5 Document the differences in event formatting between the v1 and v2 client APIs 2015-10-29 18:38:33 +00:00
Matthew Hodgson
6c1df04b4b typo 2015-10-29 02:11:47 +00:00
Paul Evans
8b0fccd691 Merge pull request #138 from matrix-org/paul/s@context@room_id@ 
Use 'room' or 'room ID' instead of 'context' when describing federation protocol
 2015-10-28 18:54:26 +00:00