Commit Graph

6721 Commits (57042769819f1fad921f54a8f0cd9ebb112ebb9c)
 

Author SHA1 Message Date
Daniel Wagner-Hall 3dc7eb23fa Merge pull request #244 from matrix-org/daniel/avatarurls
Return room avatar URLs in /publicRooms
9 years ago
Daniel Wagner-Hall 48aab7bad9 Return room avatar URLs in /publicRooms 9 years ago
Daniel Wagner-Hall acc6dfed68 Merge pull request #250 from matrix-org/daniel/versionsyo
Add /_matrix/versions to spec
9 years ago
Daniel Wagner-Hall 5e30d75ccb Add /_matrix/versions to spec 9 years ago
Daniel Wagner-Hall ae7a1f2e6c Merge pull request #249 from matrix-org/daniel/purgeguestaccesswithallkindsoffire
Remove mention that /sync takes an inline filter
9 years ago
Daniel Wagner-Hall 713415015b Remove mention that /sync takes an inline filter 9 years ago
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
9 years ago
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
9 years ago
Daniel Wagner-Hall d3f05ae49a Guests can upgrade to regular accounts 9 years ago
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
9 years ago
Erik Johnston 70a6bef580 Merge pull request #247 from matrix-org/erikj/create_room_3pid_invite
Support 3pid invites in /createRoom
9 years ago
Erik Johnston 48f56bfbfb Support 3pid invites in /createRoom 9 years ago
Daniel Wagner-Hall 1eee36e889 Merge pull request #232 from matrix-org/daniel/deprecatestuff
Deprecated deprecated APIs
9 years ago
Daniel Wagner-Hall 8fd6ea58ba Merge pull request #239 from matrix-org/daniel/mroommemberstates
Explain what the room member states mean
9 years ago
Matthew Hodgson c7d11335cf Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc 9 years ago
Matthew Hodgson 691d9ba664 typo :( 9 years ago
Mark Haines f648360f5d Merge pull request #246 from matrix-org/markjh/room_filter
Add top level filters for filtering by room id.
9 years ago
Paul Evans c9ecfa7643 Merge pull request #242 from matrix-org/paul/federation
Don't need to document /pdu/ any more
9 years ago
Mark Haines 559c0eb344 Merge pull request #245 from matrix-org/markjh/account_data_filters
Document filtering for account data
9 years ago
Mark Haines 52bb20b142 Document filtering for account data 9 years ago
Mark Haines 4c43939977 more backticks 9 years ago
Mark Haines 9b4a37f57b backticks 9 years ago
Mark Haines 288c7ed353 Add top level filters for filtering by room id. 9 years ago
Mark Haines 2ea66e9300 Merge branch 'markjh/account_data_filters' into markjh/room_filter 9 years ago
Mark Haines a32ed96a0f Document filtering for account data 9 years ago
Mark Haines e413f05c87 Merge pull request #243 from matrix-org/markjh/wildcards
Filters don't support wildcards for senders or room ids
9 years ago
Mark Haines c9349b302a Filters don't support wildcards for senders or room ids 9 years ago
Paul "LeoNerd" Evans 1f876778b5 Don't need to document /pdu/ any more 9 years ago
Paul Evans 0a2bdb1818 Merge pull request #240 from matrix-org/paul/federation
Document the `/event` and `/backfill` S-S APIs
9 years ago
Daniel Wagner-Hall 17716c6c64 Delete old drafts
This information is now either in the spec, or complete lies
9 years ago
Daniel Wagner-Hall c959ca689c Explain what the room member states mean 9 years ago
Daniel Wagner-Hall f5f90b6948 Merge pull request #237 from matrix-org/daniel/3pid
Add display_name to 3pid invites in m.room.member
9 years ago
Paul "LeoNerd" Evans 116253b2f5 Document the /event/:event_id/ federation endpoint 9 years ago
Daniel Wagner-Hall 9bfe86f474 Add display_name to 3pid invites in m.room.member 9 years ago
Richard van der Hoff 20c7af3186 Merge pull request #236 from matrix-org/rav/search_spec_fixes
Tweaks/clarifications to search spec
9 years ago
Richard van der Hoff e4dd346a81 Restore 'client behaviour' section
Because it's the standard
9 years ago
Richard van der Hoff b7c255a887 Tweaks/clarifications to search spec
Fixes https://matrix.org/jira/browse/SPEC-305
9 years ago
Daniel Wagner-Hall 34bab312d3 Merge pull request #231 from matrix-org/daniel/oldversions
Add links to old releases
9 years ago
Daniel Wagner-Hall b6cd3adc2f Merge pull request #233 from matrix-org/daniel/txnid
Merge pull request #233 from matrix-org/daniel/txnid
9 years ago
Paul "LeoNerd" Evans b9bee6ee73 Initial hack at some federation /backfill documentation 9 years ago
Matthew Hodgson 2e7b3052c2 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc 9 years ago
Matthew Hodgson f8f76794a3 fix random whitespace bug 9 years ago
Daniel Wagner-Hall b88158a193 Merge pull request #235 from Xe/master
fix a typo in the example json for the old sync description
9 years ago
Christine Dodrill 7090e491de fix a typo in the example json for the old sync description 9 years ago
Erik Johnston 7980e65502 Merge pull request #234 from matrix-org/erikj/search_yet_agian
Note that count is approximate
9 years ago
Erik Johnston 88b350ca8b Better wording 9 years ago
Erik Johnston a2082e4b38 Note that count is approximate 9 years ago
Daniel Wagner-Hall dbba737135 Explain scope of uniqueness of txnid 9 years ago
Daniel Wagner-Hall 3e086909f1 Deprecated deprecated APIs 9 years ago
Daniel Wagner-Hall 678dbbe08a s/-/_/ 9 years ago