Commit graph

162 commits

Author SHA1 Message Date
Richard van der Hoff
68a4306773 Split room previews into a separate module
Guest access and room peeking are orthogonal
2016-02-19 15:26:28 +00:00
Mark Haines
3db6980e0b Remove references to device specific push rules
Since they weren't implemented on the servers and weren't
used by the clients.
2016-02-18 16:05:47 +00:00
Matthew Hodgson
6925547875 remove the oversimplification that the WebRTC standard is based around two-oparty communication 2016-02-11 18:34:28 +00:00
Richard van der Hoff
b2e0a855cc Add 'event' to event context API
also link through to the event schemas
2016-02-01 17:45:45 +00:00
Richard van der Hoff
cff1b4ae35 Merge pull request #251 from matrix-org/daniel/guestshiz
Clarify guest /events and /sync
2016-01-08 00:47:57 +00:00
Daniel Wagner-Hall
3edff684a1 Merge pull request #253 from matrix-org/daniel/guestupgrade
Guests can upgrade to regular accounts
2016-01-07 16:39:35 +00:00
Daniel Wagner-Hall
7d9547274c Clarify guest /events and /sync 2016-01-07 11:59:38 +00:00
Daniel Wagner-Hall
713415015b Remove mention that /sync takes an inline filter 2016-01-06 15:51:07 +00:00
Daniel Wagner-Hall
d3f05ae49a Guests can upgrade to regular accounts 2016-01-05 17:30:55 +00:00
Daniel Wagner-Hall
ca67aa7b4f Tidy up guest access spec
* Mention that /leave is allowed
* Mention that /sync is allowed
* Re-order such that the whole list of APIs fits on one screen
2016-01-05 13:45:04 +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
Matthew Hodgson
f8f76794a3 fix random whitespace bug 2015-12-14 08:40:41 +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
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
Daniel Wagner-Hall
a2283f5499 Remove /notify from client-server API 2015-12-08 13:25:31 +00:00
Erik Johnston
dd276d4c4d Add event context module 2015-12-07 16:56:03 +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
2aef684e7e Add list of required supported groupings 2015-12-07 16:02:22 +00:00
Erik Johnston
c61ae86102 Specify behaviour if server does not support pagination 2015-12-07 16:00:15 +00:00
Richard van der Hoff
3939ccf20c Remove e2e drafts from master
This is now being tracked in the main spec, on the drafts/e2e branch.
2015-12-07 14:45:46 +00:00
Daniel Wagner-Hall
873b0dcecf Replace version numbers with release numbers 2015-12-04 11:09:35 +00:00
Daniel Wagner-Hall
f308b7543c Specify /admin/whois/{userId} 2015-12-03 16:26:45 +00:00
Daniel Wagner-Hall
4baba85fe5 Draftify e2e in anticipation of a spec release 2015-12-03 11:52:11 +00:00
Daniel Wagner-Hall
2f3a00fe34 Consistently spell homeserver as homeserver 2015-12-02 19:23:33 +00:00
Matthew Hodgson
b946d39886 typo 2015-12-02 01:25:07 +00:00
Daniel Wagner-Hall
f6229f649a Remove confusing wording 2015-12-01 16:58:40 +00:00
Erik Johnston
23b2497743 Expand on where pagination tokens can be returned 2015-12-01 15:31:35 +00:00
Erik Johnston
46fd0b252c Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/search_yet_agian 2015-12-01 15:06:13 +00:00
Daniel Wagner-Hall
6c66bfc755 Flatten out v1 and v2_alpha directories
As a side effect, I got rid of all of the horrible symlinks and just put
in all of the proper relative paths. Because the horrible symlinks were
horrible.
2015-11-30 11:22:57 +00:00
Daniel Wagner-Hall
e401d3e262 Merge pull request #184 from matrix-org/daniel/splitspec
Split spec into page-per-section
2015-11-27 16:46:06 +00:00
Daniel Wagner-Hall
e171acf01f Split spec into page-per-section 2015-11-27 16:45:47 +00:00
Mark Haines
a20a49abf6 Merge pull request #168 from matrix-org/markjh/client_config
Add API for setting client config
2015-11-27 15:32:21 +00:00
Mark Haines
c5f457cee9 Merge pull request #132 from matrix-org/markjh/room_tags
Document a v2 api for setting tags on rooms
2015-11-27 15:31:54 +00:00
Richard van der Hoff
0b1ba70a32 fix rst markup
`` > `
2015-11-27 13:33:58 +00:00
Richard van der Hoff
2dbb8ba56c Fix title levels
make the title decoration consistent with the rest of the spec
2015-11-27 12:53:03 +00:00
Richard van der Hoff
51ca25a472 Merge branch 'master' into markjh/end_to_end_encryption 2015-11-27 11:49:11 +00:00
Richard van der Hoff
5f4458b2ff Merge branch 'master' into markjh/end_to_end_encryption 2015-11-27 11:45:49 +00:00
Daniel Wagner-Hall
5e30b5b8d7 Remove POST version of /send
PUT should always be used.
2015-11-26 16:46:29 +00:00
Mark Haines
032ee75537 Update specification wording to match s/config/account_data/ 2015-11-19 10:42:22 +00:00
Mark Haines
05c0092664 s/config/account_data/ 2015-11-19 10:38:22 +00:00
Mark Haines
40f7eab73f s/private_user_data/account_data/ 2015-11-18 15:44:18 +00:00
Mark Haines
24c4b8b095 Merge branch 'markjh/room_tags' into markjh/client_config
Conflicts:
	api/client-server/v1/rooms.yaml
	api/client-server/v1/sync.yaml
	api/client-server/v2_alpha/sync.yaml
	specification/targets.yaml
2015-11-18 15:30:16 +00:00
Mark Haines
fcbb985073 s/private_user_data/account_data/ 2015-11-18 15:27:26 +00:00
Erik Johnston
373c6c8270 Add ordering, pagination and grouping comments 2015-11-17 11:56:05 +00:00
Mark Haines
c77b22778f Add some documentation on names of tags 2015-11-16 17:48:41 +00:00
Mark Haines
25769493b1 Fix template 2015-11-16 17:14:41 +00:00
Mark Haines
e7fbe6f13b Limit the size of a tag 2015-11-16 17:13:02 +00:00
Mark Haines
48f35e15cb describe how to order rooms that don't have an order in their tags 2015-11-16 17:08:59 +00:00
Mark Haines
299af673da Specify how ordering of tags is supposed to work 2015-11-16 17:04:19 +00:00