Commit graph

299 commits

Author SHA1 Message Date
Daniel Wagner-Hall
2e46b587b8 Require explicit un-banning 2016-01-15 14:08:40 +00:00
David Baker
169cc98101 M_INVALID_USERNAME to be consistent with the name of the parameter 2016-01-15 10:04:29 +00:00
David Baker
2301a792d7 Add an error code for invalid user names. 2016-01-14 17:19:04 +00:00
Matthew Hodgson
cfbb695fd3 typoe 2016-01-13 18:25:33 +00:00
Daniel Wagner-Hall
1e2b63763e /join and /room/:roomId/join aren't exact aliases
Separate them, clarify their differences.

Also, fix some links which weren't being properly populated.
2016-01-13 15:55:51 +00:00
Richard van der Hoff
6265d6ce06 Merge pull request #254 from matrix-org/rav/filter_spec
Add some missing titles to the filter upload spec
2016-01-11 12:59:38 +00:00
Richard van der Hoff
972153be4f Fix endpoint path for /context
s/api//
2016-01-08 14:06:53 +00:00
Richard van der Hoff
ff26e0dc48 Add some missing titles to the filter upload spec 2016-01-07 18:31:09 +00:00
Daniel Wagner-Hall
0e967edfd9 Fix thinko 2016-01-07 12:38:32 +00:00
Daniel Wagner-Hall
7d9547274c Clarify guest /events and /sync 2016-01-07 11:59:38 +00:00
Daniel Wagner-Hall
48aab7bad9 Return room avatar URLs in /publicRooms 2016-01-06 18:00:21 +00:00
Daniel Wagner-Hall
5e30d75ccb Add /_matrix/versions to spec 2016-01-06 17:43:20 +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
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
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
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
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
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
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
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
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
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
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
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
Erik Johnston
8e7f6d44f6 Remove v1 references 2015-12-08 14:01:16 +00:00
Erik Johnston
4967b092aa Add description of state response key 2015-12-08 13:37:32 +00:00
Daniel Wagner-Hall
a2283f5499 Remove /notify from client-server API 2015-12-08 13:25:31 +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