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
1422 commits 30 branches 42 tags 32 MiB
Commit graph

1422 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mark Haines 2ea66e9300 Merge branch 'markjh/account_data_filters' into markjh/room_filter 2015-12-21 20:38:50 +00:00
Mark Haines a32ed96a0f Document filtering for account data 2015-12-21 20:31:02 +00:00
Mark Haines e413f05c87 Merge pull request #243 from matrix-org/markjh/wildcards 
Filters don't support wildcards for senders or room ids
 2015-12-21 20:25:26 +00:00
Mark Haines c9349b302a Filters don't support wildcards for senders or room ids 2015-12-21 17:17:28 +00:00
Paul "LeoNerd" Evans 1f876778b5 Don't need to document /pdu/ any more 2015-12-21 16:50:56 +00:00
Paul Evans 0a2bdb1818 Merge pull request #240 from matrix-org/paul/federation 
Document the `/event` and `/backfill` S-S APIs
 2015-12-21 16:50:21 +00:00
Daniel Wagner-Hall 17716c6c64 Delete old drafts 
This information is now either in the spec, or complete lies
 2015-12-21 15:20:45 +00:00
Daniel Wagner-Hall c959ca689c Explain what the room member states mean 2015-12-21 14:51:49 +00:00
Daniel Wagner-Hall f5f90b6948 Merge pull request #237 from matrix-org/daniel/3pid 
Add display_name to 3pid invites in m.room.member
 2015-12-21 13:40:10 +01:00
Paul "LeoNerd" Evans 116253b2f5 Document the /event/:event_id/ federation endpoint 2015-12-17 20:45:57 +00:00
Daniel Wagner-Hall 9bfe86f474 Add display_name to 3pid invites in m.room.member 2015-12-17 19:01:20 +01:00
Richard van der Hoff 20c7af3186 Merge pull request #236 from matrix-org/rav/search_spec_fixes 
Tweaks/clarifications to search spec
 2015-12-17 14:12:49 +00:00
Richard van der Hoff e4dd346a81 Restore 'client behaviour' section 
Because it's the standard
 2015-12-17 14:07:35 +00:00
Richard van der Hoff b7c255a887 Tweaks/clarifications to search spec 
Fixes https://matrix.org/jira/browse/SPEC-305
 2015-12-17 13:40:22 +00:00
Daniel Wagner-Hall 34bab312d3 Merge pull request #231 from matrix-org/daniel/oldversions 
Add links to old releases
 2015-12-17 11:24:28 +01:00
Daniel Wagner-Hall b6cd3adc2f Merge pull request #233 from matrix-org/daniel/txnid 
Merge pull request #233 from matrix-org/daniel/txnid
 2015-12-17 11:24:07 +01:00