wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1328 commits 4 branches 0 tags 17 MiB
Commit graph

1328 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Daniel Wagner-Hall
77cfd9656c Merge pull request #228 from matrix-org/daniel/listfiles 
Take list of files to edit as args
 2015-12-09 14:28:46 +00:00
Daniel Wagner-Hall
a484f04b33 Merge pull request #221 from matrix-org/daniel/pushaway 
Merge pull request #221 from matrix-org/daniel/pushaway
 2015-12-09 14:04:02 +00:00
Daniel Wagner-Hall
60127de1e3 Take list of files to edit as args 2015-12-09 13:50:15 +00:00
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
 2015-12-09 11:53:43 +00:00
Mark Haines
c3a1318886 Make it explicit that the JSON filter object is passed as a string 2015-12-09 10:50:02 +00:00
Kegan Dougal
bca3add9a7 Formatting 2015-12-08 16:38:48 +00:00
Kegan Dougal
d01ff6b495 Add noddy push gateway placeholder 2015-12-08 16:37:51 +00:00
Daniel Wagner-Hall
f22adad02e Merge pull request #225 from matrix-org/daniel/links 
Add link to speculator
 2015-12-08 16:19:17 +00:00
Matthew Hodgson
519013d367 EOL mailman 2015-12-08 16:14:25 +00:00
Erik Johnston
c96848d1bc Merge pull request #169 from matrix-org/erikj/search_yet_agian 
Search: Document event context, groups and orders.
 2015-12-08 16:11:03 +00:00
Erik Johnston
95255bcdf5 Use rst not html 2015-12-08 16:02:55 +00:00
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