Commit Graph

1473 Commits (b3af29e74611361533bdb38f3d642e081f90e6ec)
 

Author SHA1 Message Date
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
Daniel Wagner-Hall 7f87760655 Add links to old releases 9 years ago
Daniel Wagner-Hall a767ce608c Merge pull request #230 from matrix-org/daniel/introfirst
Mention intro before specs
9 years ago
Daniel Wagner-Hall 8d184570a8 Mention intro before specs 9 years ago
Daniel Wagner-Hall 997f3303f3 Revert "Add links to old releases"
This reverts commit de12870791.
9 years ago
Daniel Wagner-Hall de12870791 Add links to old releases 9 years ago
Daniel Wagner-Hall 53a21fc0b6 Note why we're not versioning index and intro 9 years ago
Daniel Wagner-Hall 5080e8c079 Merge pull request #229 from matrix-org/daniel/indexpage
Add index page
9 years ago
Daniel Wagner-Hall 8eb84612f2 Add index page 9 years ago
Daniel Wagner-Hall aaeaa1dd98 Detect major version in presence of patch release 9 years ago
Daniel Wagner-Hall ad7874a730 Use site-relative stylesheet 9 years ago
Daniel Wagner-Hall 77cfd9656c Merge pull request #228 from matrix-org/daniel/listfiles
Take list of files to edit as args
9 years ago
Daniel Wagner-Hall a484f04b33 Merge pull request #221 from matrix-org/daniel/pushaway
Merge pull request #221 from matrix-org/daniel/pushaway
9 years ago
Daniel Wagner-Hall 60127de1e3 Take list of files to edit as args 9 years ago
Mark Haines a33e49fd1e Merge pull request #224 from matrix-org/markjh/filter_inline
Allow the filter JSON to be passed inline in the /sync request
9 years ago
Mark Haines c3a1318886 Make it explicit that the JSON filter object is passed as a string 9 years ago
Kegan Dougal bca3add9a7 Formatting 9 years ago
Kegan Dougal d01ff6b495 Add noddy push gateway placeholder 9 years ago
Daniel Wagner-Hall f22adad02e Merge pull request #225 from matrix-org/daniel/links
Add link to speculator
9 years ago
Matthew Hodgson 519013d367 EOL mailman 9 years ago
Erik Johnston c96848d1bc Merge pull request #169 from matrix-org/erikj/search_yet_agian
Search: Document event context, groups and orders.
9 years ago
Erik Johnston 95255bcdf5 Use rst not html 9 years ago
Daniel Wagner-Hall 7b63c042fb Merge pull request #222 from matrix-org/daniel/removessmention
Don't mention server-server stuff in client-server spec
9 years ago
Daniel Wagner-Hall 4be078440d Don't mention server-server stuff in client-server spec 9 years ago
Daniel Wagner-Hall a9b4f6fef0 Add missing _ to paths 9 years ago
Erik Johnston e1fda6b6b6 Remove double the 9 years ago
Erik Johnston 9c98c80bde Fix up filter description 9 years ago
Erik Johnston c4085b0475 Merge pull request #139 from matrix-org/erikj/event_context_api
Add event context api swagger
9 years ago
Daniel Wagner-Hall fd3dde5e88 Add link to speculator 9 years ago
Mark Haines ed70bcb180 Add a rationale for allowing both inline filters and passing filters by id. 9 years ago
Mark Haines 878ce2f206 Allow the filter JSON to be passed inline in the /sync request 9 years ago
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
9 years ago
Erik Johnston 6025569a73 Remove unused 403 stub 9 years ago
Erik Johnston 0fb88e26f0 Add tags 9 years ago
Erik Johnston 4290882034 Remove superfluous quote 9 years ago
Paul "LeoNerd" Evans e32070f189 Decide that joining HS is the one that specifies the join event ID 9 years ago
Erik Johnston 8e7f6d44f6 Remove v1 references 9 years ago
Paul "LeoNerd" Evans 2410e8b15a Merge branch 'master' into paul/federation-room-join 9 years ago
Erik Johnston 4967b092aa Add description of state response key 9 years ago