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

1351 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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
Paul "LeoNerd" Evans b9bee6ee73 Initial hack at some federation /backfill documentation 2015-12-14 20:00:49 +00:00
Matthew Hodgson 2e7b3052c2 Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc 2015-12-14 08:40:47 +00:00
Matthew Hodgson f8f76794a3 fix random whitespace bug 2015-12-14 08:40:41 +00:00
Daniel Wagner-Hall b88158a193 Merge pull request #235 from Xe/master 
fix a typo in the example json for the old sync description
 2015-12-11 16:11:41 +00:00
Christine Dodrill 7090e491de fix a typo in the example json for the old sync description 2015-12-11 08:10:37 -08:00
Erik Johnston 7980e65502 Merge pull request #234 from matrix-org/erikj/search_yet_agian 
Note that count is approximate
 2015-12-11 12:47:47 +00:00
Erik Johnston 88b350ca8b Better wording 2015-12-11 11:41:51 +00:00
Erik Johnston a2082e4b38 Note that count is approximate 2015-12-11 10:54:01 +00:00
Daniel Wagner-Hall dbba737135 Explain scope of uniqueness of txnid 2015-12-10 15:47:27 +00:00
Daniel Wagner-Hall 3e086909f1 Deprecated deprecated APIs 2015-12-10 14:47:14 +00:00
Daniel Wagner-Hall 678dbbe08a s/-/_/ 2015-12-09 17:17:45 +00:00
Daniel Wagner-Hall 7f87760655 Add links to old releases 2015-12-09 16:45:56 +00:00
Daniel Wagner-Hall a767ce608c Merge pull request #230 from matrix-org/daniel/introfirst 
Mention intro before specs
 2015-12-09 16:44:31 +00:00
Daniel Wagner-Hall 8d184570a8 Mention intro before specs 2015-12-09 16:40:47 +00:00
Daniel Wagner-Hall 997f3303f3 Revert "Add links to old releases" 
This reverts commit de12870791.
 2015-12-09 16:38:40 +00:00
Daniel Wagner-Hall de12870791 Add links to old releases 2015-12-09 16:32:36 +00:00
Daniel Wagner-Hall 53a21fc0b6 Note why we're not versioning index and intro 2015-12-09 16:29:11 +00:00
Daniel Wagner-Hall 5080e8c079 Merge pull request #229 from matrix-org/daniel/indexpage 
Add index page
 2015-12-09 16:24:58 +00:00
Daniel Wagner-Hall 8eb84612f2 Add index page 2015-12-09 16:17:58 +00:00
Daniel Wagner-Hall aaeaa1dd98 Detect major version in presence of patch release 2015-12-09 15:56:58 +00:00
Daniel Wagner-Hall ad7874a730 Use site-relative stylesheet 2015-12-09 14:35:25 +00:00