Commit graph

392 commits

Author SHA1 Message Date
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
Erik Johnston
1d01f69c3c Merge remote-tracking branch 'origin/master' into erikj/search_actual 2015-10-19 13:46:58 +01:00
Erik Johnston
111ca99519 Clarify that this doesn't include events that occurred after you left the room. 2015-10-19 13:46:30 +01:00
Kegan Dougal
ae90d15b3c Add m.room.avatar 2015-10-19 10:46:07 +01:00
Daniel Wagner-Hall
c70067dd1e Simplify language 2015-10-19 10:44:26 +01:00
Daniel Wagner-Hall
6161a920b6 Update 3pid invite section to reflect signed property 2015-10-16 18:29:20 +01:00
Erik Johnston
eb59b8e9d1 Mention count 2015-10-16 10:16:40 +01:00
Erik Johnston
a6cb2e4339 Mention rank 2015-10-15 16:40:21 +01:00
Erik Johnston
24e36adbe3 Mention e2e encryption 2015-10-15 16:09:11 +01:00
Erik Johnston
770cfbc5de Be explicit about the events the search is performed over 2015-10-15 16:08:24 +01:00
Erik Johnston
906c59385f s/had/has/ 2015-10-15 15:49:58 +01:00
Erik Johnston
c47a94658a Mention supported keys 2015-10-15 11:12:00 +01:00
Erik Johnston
af347baa68 Better phrasing 2015-10-15 11:06:15 +01:00
Erik Johnston
96a4996c76 Mention search categories 2015-10-15 11:02:37 +01:00
Kegsay
3a2c8cd4b3 Merge pull request #91 from matrix-org/module-history-vis
History visibility module
2015-10-15 11:02:24 +01:00
Kegan Dougal
5aad67f74d Review comments round III 2015-10-15 11:01:11 +01:00
Kegsay
c5dc383668 Merge pull request #85 from matrix-org/module-im
Instant messaging module
2015-10-15 10:59:41 +01:00
Kegan Dougal
507cb29e39 Review comments round deux 2015-10-15 10:37:15 +01:00
Kegan Dougal
f51ee70633 Review comments round 2 2015-10-15 10:19:51 +01:00
Kegsay
1229ad24dd Merge pull request #103 from matrix-org/spec-165-mxc-security
SPEC-165: Outline directory traversal attacks on MXC URIs
2015-10-14 17:48:59 +01:00
Erik Johnston
728b5a7951 Add very short summary 2015-10-14 17:20:00 +01:00
Erik Johnston
007bb1a69a Add extra new line 2015-10-14 16:26:14 +01:00
Erik Johnston
d8bc0c9315 Add search module 2015-10-14 16:13:43 +01:00
Kegan Dougal
44b19a8b0e SPEC-165: Outline directory traversal attacks on MXC URIs 2015-10-14 15:27:56 +01:00
Kegan Dougal
3608f3a282 SPEC-144 : Use https examples not http. 2015-10-14 14:44:09 +01:00
Kegan Dougal
4170dbd5cf Review comments 2015-10-13 11:29:54 +01:00
Kegan Dougal
173d00cea0 Review comments 2015-10-13 11:08:19 +01:00
Daniel Wagner-Hall
2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2
Conflicts:
	specification/targets.yaml
2015-10-12 18:11:01 +01:00
Daniel Wagner-Hall
4a1fb74897 Review comments 2015-10-12 18:08:51 +01:00
Kegan Dougal
8f5c796884 Linkify 'pushers' 2015-10-12 17:50:46 +01:00
Kegan Dougal
e378de8379 Shuffle history visibility module to be in the module format 2015-10-09 11:04:11 +01:00
Kegan Dougal
f2a6950cc3 Minor tweaks; allow objects without props/parents if a title is set
This allows us to do things like {Tweaks} where Tweaks is defined somewhere
else.
2015-10-08 16:21:26 +01:00
Daniel Wagner-Hall
dc3c02aff5 Review comments 2015-10-08 10:08:38 -05:00
Daniel Wagner-Hall
21a40b317d Merge branch 'master' into daniel/threepidinvites-2 2015-10-08 09:41:17 -05:00
Kegan Dougal
9c95ee5c1f Modify wording and formatting 2015-10-08 15:36:03 +01:00
Kegan Dougal
31ae4b3859 Swaggerify push notification API
Edit units.py to support nested JSON request keys
2015-10-08 13:08:21 +01:00
Kegan Dougal
a9618a981b Swaggerify the /enabled endpoint 2015-10-08 11:16:42 +01:00
Kegan Dougal
56ce432399 Get profile tag keys displaying correctly. 2015-10-08 10:14:05 +01:00
Kegan Dougal
db25276856 Start adding in push definitions
This is going to be painful to represent due to how the push API allows
mixed types (strings or objects) and mixed top-level keys ("content" rule kind
allowing "pattern" as a top-level key). We may wish to re-visit the design
of this API for v2.
2015-10-07 17:44:05 +01:00
Kegan Dougal
c5edc60c4c Add push YAML for pushers endpoint.
Also display "required" text on required JSON body request params. Also
increase the size of the request param column to support longer param names
present in the pushers API.
2015-10-07 16:01:36 +01:00
Kegan Dougal
d3ed517ebf Finish laying out rough sections 2015-10-07 14:14:15 +01:00
Kegan Dougal
a7400508c6 Define module titles from the template 2015-10-07 14:07:36 +01:00
Kegan Dougal
319ba8f404 Combine push files into one
We can fork it out again if it makes sense, but certainly 2/3 of the files
were very small and it just adds more complexity when refactoring.
2015-10-07 14:00:16 +01:00
Kegan Dougal
91ca36509b Flesh out IM module 2015-10-07 11:51:49 +01:00
Kegan Dougal
8e5c832ff9 Flesh out more of the IM module 2015-10-05 13:45:23 +01:00