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
|
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 |
|
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 |