Commit graph

1311 commits

Author SHA1 Message Date
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
Erik Johnston
4290882034 Remove superfluous quote 2015-12-08 14:06:59 +00:00
Paul "LeoNerd" Evans
e32070f189 Decide that joining HS is the one that specifies the join event ID 2015-12-08 14:04:40 +00:00
Erik Johnston
8e7f6d44f6 Remove v1 references 2015-12-08 14:01:16 +00:00
Paul "LeoNerd" Evans
2410e8b15a Merge branch 'master' into paul/federation-room-join 2015-12-08 14:00:06 +00:00
Erik Johnston
4967b092aa Add description of state response key 2015-12-08 13:37:32 +00:00
Daniel Wagner-Hall
27c022f2a4 Merge pull request #220 from matrix-org/daniel/changelog
Format changelog more nicely
2015-12-08 13:30:31 +00:00
Daniel Wagner-Hall
a2283f5499 Remove /notify from client-server API 2015-12-08 13:25:31 +00:00
Daniel Wagner-Hall
217e22fc30 Format changelog more nicely 2015-12-08 13:18:36 +00:00
Daniel Wagner-Hall
1d2ed9e9d6 Changelogs: indent instead of blockquoting 2015-12-08 11:43:10 +00:00
Daniel Wagner-Hall
dcd51c39b3 Indent state-key descriptions
Right now two spaces make a <dt> whereas four does the right thing.
2015-12-08 10:47:07 +00:00
Daniel Wagner-Hall
19dfafe376 Remove superfluous space
This causes a <dt> to get rendered around the <tt>s which breaks some
formatting.
2015-12-08 10:34:48 +00:00
Erik Johnston
dd276d4c4d Add event context module 2015-12-07 16:56:03 +00:00
Erik Johnston
f4b9433c7b Better wording 2015-12-07 16:33:48 +00:00
Erik Johnston
584104c432 Make example valid event id 2015-12-07 16:32:43 +00:00
Erik Johnston
fda07e0d41 Merge remote-tracking branch 'origin/master' into erikj/event_context_api 2015-12-07 16:31:55 +00:00
Erik Johnston
856dd9100e Merge remote-tracking branch 'origin/master' into erikj/search_yet_agian 2015-12-07 16:28:14 +00:00
Erik Johnston
118a6aa040 Reword groupings descriptions 2015-12-07 16:06:25 +00:00