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

236 commits

Author SHA1 Message Date
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
Mark Haines
3b390bff3c Merge branch 'master' into markjh/room_tags 
Conflicts:
	api/client-server/v1/rooms.yaml
	specification/targets.yaml
 2015-11-16 16:56:35 +00:00
Mark Haines
8f5783615c Merge branch 'master' into markjh/client_config 
Conflicts:
	api/client-server/v1/rooms.yaml
	specification/targets.yaml
 2015-11-16 16:51:45 +00:00
Mark Haines
c3769ef75c Add a module for client config to the specification 2015-11-16 16:49:32 +00:00
Daniel Wagner-Hall
ea364a108b Merge pull request #161 from matrix-org/daniel/guestdisplaynames 
Merge pull request #161 from matrix-org/daniel/guestdisplaynames

Guests are allowed to set displaynames
 2015-11-12 13:23:49 +00:00
Daniel Wagner-Hall
29d9c8eec6 Guests are allowed to set displaynames 2015-11-12 12:05:02 +00:00
Daniel Wagner-Hall
061105c9dc Guest users are allowed room initialSync 2015-11-11 17:18:58 +00:00
Daniel Wagner-Hall
24c2036a35 3pid invites: remove mentions of display_name 2015-11-09 17:30:18 +00:00
Daniel Wagner-Hall
e72151f2c3 Specify guest room access 
This was reviewed as PR #150 and merged from daniel/anonymousaccess
 2015-11-06 18:15:21 +00:00
Daniel Wagner-Hall
161441fa3a Update 3pid spec based on new implementation 2015-11-05 18:11:20 +00:00
Richard van der Hoff
8cba11b1cd Add some links to spec bugs for display names 
Just added a couple of TODO comments to useful jira bugs
 2015-11-05 11:06:31 +00:00
Richard van der Hoff
2fd5fc39a0 Add spec for calculating display names for rooms and users 
Merged from https://github.com/matrix-org/matrix-doc/pull/145
 2015-11-05 10:55:11 +00:00
Mark Haines
3953006792 Fix spelling 2015-11-03 15:54:33 +00:00
Mark Haines
149890227a Fix wording 2015-11-02 13:35:11 +00:00
Mark Haines
52f55e0542 Allow room tags to have asssociated content, and return that content in the m.tag events 2015-11-02 13:31:25 +00:00
Mark Haines
f557e69860 Note that m.tag events can appear in v1 initialSync and /events as well as v2 sync. Only add the room_id for v1 /events since it is redundant in v1 /initialSync 2015-11-02 10:13:47 +00:00
Mark Haines
65066a76b3 Add the m.tags event to a `private_user_data key rather than including it under the ephemeral` key 2015-10-26 18:30:04 +00:00
Mark Haines
9b0d20315a Add the tags module to the specification targets 2015-10-26 16:22:04 +00:00
Mark Haines
12e33a3b09 Document a v2 api for setting tags on rooms 2015-10-26 16:14:24 +00:00
Daniel Wagner-Hall
7c250f91ff Merge pull request #127 from matrix-org/daniel/exposedrooms 
Allow history to be noted as world-readable
 2015-10-26 10:30:32 +00:00
Kegsay
4823a133cd Merge pull request #124 from matrix-org/clarify_scale_crop 
Clarify 'scale' & 'crop' resize methods
 2015-10-26 09:57:32 +00:00
Daniel Wagner-Hall
67880686d5 Allow history to be noted as world-readable 
SPEC-237
 2015-10-23 14:02:53 +01:00
David Baker
01064369a4 Add some clarification on the difference between 'scale' and 'crop' resize methods 2015-10-23 11:57:15 +01:00
Mark Haines
e3e8026025 Fix list formatting so that we aren't including everything in blockquotes 2015-10-23 10:51:31 +01:00
Erik Johnston
f0c74a9c83 Merge pull request #96 from matrix-org/erikj/search_actual 
Add search API
 2015-10-23 10:19:36 +01:00
Erik Johnston
4a558ad63b Typo 2015-10-23 10:19:25 +01:00
Daniel Wagner-Hall
a9a9067d7e Merge pull request #114 from matrix-org/daniel/3pidtosigned 
Update 3pid invite section to reflect signed property
 2015-10-19 15:52:50 +01:00