Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-24 01:58:36 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5700 commits 30 branches 42 tags 32 MiB
Commit graph

5700 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Wagner-Hall 7b63c042fb Merge pull request #222 from matrix-org/daniel/removessmention 
Don't mention server-server stuff in client-server spec
 2015-12-08 15:42:44 +00:00
Daniel Wagner-Hall 4be078440d Don't mention server-server stuff in client-server spec 2015-12-08 15:42:37 +00:00
Daniel Wagner-Hall a9b4f6fef0 Add missing _ to paths 2015-12-08 15:39:32 +00:00
Erik Johnston e1fda6b6b6 Remove double the 2015-12-08 15:35:59 +00:00
Erik Johnston 9c98c80bde Fix up filter description 2015-12-08 15:26:06 +00:00
Erik Johnston c4085b0475 Merge pull request #139 from matrix-org/erikj/event_context_api 
Add event context api swagger
 2015-12-08 15:24:57 +00:00
Daniel Wagner-Hall fd3dde5e88 Add link to speculator 2015-12-08 14:42:10 +00:00
Mark Haines ed70bcb180 Add a rationale for allowing both inline filters and passing filters by id. 2015-12-08 14:36:50 +00:00
Mark Haines 878ce2f206 Allow the filter JSON to be passed inline in the /sync request 2015-12-08 14:32:11 +00:00
Paul Evans bcebcc61ef Merge pull request #223 from matrix-org/paul/federation-room-join 
Decide that joining HS is the one that specifies the join event ID
 2015-12-08 14:12:32 +00:00
Erik Johnston 6025569a73 Remove unused 403 stub 2015-12-08 14:10:45 +00:00
Erik Johnston 0fb88e26f0 Add tags 2015-12-08 14:07:08 +00:00
Erik Johnston 4290882034 Remove superfluous quote 2015-12-08 14:06:59 +00:00
Paul "LeoNerd" Evans e32070f189 Decide that joining HS is the one that specifies the join event ID 2015-12-08 14:04:40 +00:00
Erik Johnston 8e7f6d44f6 Remove v1 references 2015-12-08 14:01:16 +00:00
Paul "LeoNerd" Evans 2410e8b15a Merge branch 'master' into paul/federation-room-join 2015-12-08 14:00:06 +00:00
Erik Johnston 4967b092aa Add description of state response key 2015-12-08 13:37:32 +00:00
Daniel Wagner-Hall 27c022f2a4 Merge pull request #220 from matrix-org/daniel/changelog 
Format changelog more nicely
 2015-12-08 13:30:31 +00:00
Daniel Wagner-Hall a2283f5499 Remove /notify from client-server API 2015-12-08 13:25:31 +00:00
Daniel Wagner-Hall 217e22fc30 Format changelog more nicely 2015-12-08 13:18:36 +00:00
Daniel Wagner-Hall 1d2ed9e9d6 Changelogs: indent instead of blockquoting 2015-12-08 11:43:10 +00:00
Daniel Wagner-Hall dcd51c39b3 Indent state-key descriptions 
Right now two spaces make a <dt> whereas four does the right thing.
 2015-12-08 10:47:07 +00:00
Daniel Wagner-Hall 19dfafe376 Remove superfluous space 
This causes a <dt> to get rendered around the <tt>s which breaks some
formatting.
 2015-12-08 10:34:48 +00:00
Erik Johnston dd276d4c4d Add event context module 2015-12-07 16:56:03 +00:00
Erik Johnston f4b9433c7b Better wording 2015-12-07 16:33:48 +00:00
Erik Johnston 584104c432 Make example valid event id 2015-12-07 16:32:43 +00:00
Erik Johnston fda07e0d41 Merge remote-tracking branch 'origin/master' into erikj/event_context_api 2015-12-07 16:31:55 +00:00
Erik Johnston 856dd9100e Merge remote-tracking branch 'origin/master' into erikj/search_yet_agian 2015-12-07 16:28:14 +00:00
Erik Johnston 118a6aa040 Reword groupings descriptions 2015-12-07 16:06:25 +00:00
Erik Johnston 2aef684e7e Add list of required supported groupings 2015-12-07 16:02:22 +00:00
Erik Johnston c61ae86102 Specify behaviour if server does not support pagination 2015-12-07 16:00:15 +00:00
Erik Johnston 1ef9cc37e3 Typo 2015-12-07 15:58:31 +00:00
Erik Johnston fca8e5abe7 Add top level next_batch key to example 2015-12-07 15:54:08 +00:00
Daniel Wagner-Hall ff45142663 Flesh out changelog 
I forgot to push this before merging PR 215
 2015-12-07 15:19:54 +00:00
Daniel Wagner-Hall db5cad4711 Remove accidentally committed change 2015-12-07 15:16:06 +00:00
Richard van der Hoff 3939ccf20c Remove e2e drafts from master 
This is now being tracked in the main spec, on the drafts/e2e branch.
 2015-12-07 14:45:46 +00:00
Daniel Wagner-Hall cb3ca223d0 Merge pull request #219 from matrix-org/daniel/chdir 
Make dump-swagger work from all directories
 2015-12-07 14:45:38 +00:00
Daniel Wagner-Hall 99b8a066c8 Make dump-swagger work from all directories 2015-12-07 14:40:42 +00:00
Daniel Wagner-Hall 6b8ee850c0 Merge pull request #208 from matrix-org/daniel/resolverefs2 
Resolve references by default
 2015-12-07 14:28:40 +00:00
Daniel Wagner-Hall b8ea5f7ffb Resolve references by default 
This means I can re-use this function for the swagger-UI generation

I can't see why you would want un-resolved references as a consumer.
 2015-12-07 14:28:27 +00:00
Daniel Wagner-Hall 4c82578820 Merge pull request #215 from matrix-org/daniel/changelogs 
Merge pull request #215 from matrix-org/daniel/changelogs
 2015-12-07 14:25:12 +00:00
Daniel Wagner-Hall 39f43abbb7 Add per-API changelogs 2015-12-07 14:24:10 +00:00
Daniel Wagner-Hall 5f459e6e0a Merge pull request #217 from matrix-org/daniel/yaml 
Make all the schema files yaml
 2015-12-07 14:06:05 +00:00
Daniel Wagner-Hall f81b967e2d Make all the schema files yaml 2015-12-07 13:56:36 +00:00
Daniel Wagner-Hall 4b70dd8bac Merge pull request #213 from matrix-org/daniel/tags 
Generate swagger-ui output for client-server API

Depends on:
https://github.com/matrix-org/matrix-doc/pull/212
https://github.com/matrix-org/matrix-doc/pull/208
https://github.com/matrix-org/matrix-doc/pull/207
for the actual rendered output to not throw javascript errors at runtime.
 2015-12-07 12:45:20 +00:00
Daniel Wagner-Hall 1f5b6271f2 Generate swagger-ui output for client-server API 
Depends on:
https://github.com/matrix-org/matrix-doc/pull/212
https://github.com/matrix-org/matrix-doc/pull/208
https://github.com/matrix-org/matrix-doc/pull/207
for the actual rendered output to not throw javascript errors at runtime.
 2015-12-07 12:45:13 +00:00
Daniel Wagner-Hall c9fee294df Merge pull request #211 from matrix-org/daniel/extractas 
Move application service swagger out of c-s dir
 2015-12-07 12:00:27 +00:00
Daniel Wagner-Hall 97579f15cb Merge pull request #212 from matrix-org/daniel/pushdictification 
Take object, not bool, as param
 2015-12-07 10:39:36 +00:00
Richard van der Hoff d1d3d27e2f Merge pull request #216 from matrix-org/rav/fix_speculator_redirects 
Add a host and scheme to Location headers in redirects
 2015-12-07 10:26:38 +00:00
Richard van der Hoff f31a053995 Add a host and scheme to Location headers in redirects 
Our apache reverse-proxy can't correctly rewrite relative Location headers, so
add the Host from the request into the Location.
 2015-12-06 18:26:56 +00:00