299af673da
Specify how ordering of tags is supposed to work
9 years ago
3b390bff3c
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
9 years ago
8f5783615c
Merge branch 'master' into markjh/client_config
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
9 years ago
c3769ef75c
Add a module for client config to the specification
9 years ago
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
9 years ago
29d9c8eec6
Guests are allowed to set displaynames
9 years ago
061105c9dc
Guest users are allowed room initialSync
9 years ago
24c2036a35
3pid invites: remove mentions of display_name
9 years ago
e72151f2c3
Specify guest room access
...
This was reviewed as PR #150 and merged from daniel/anonymousaccess
9 years ago
161441fa3a
Update 3pid spec based on new implementation
9 years ago
8cba11b1cd
Add some links to spec bugs for display names
...
Just added a couple of TODO comments to useful jira bugs
9 years ago
2fd5fc39a0
Add spec for calculating display names for rooms and users
...
Merged from https://github.com/matrix-org/matrix-doc/pull/145
9 years ago
3953006792
Fix spelling
9 years ago
149890227a
Fix wording
9 years ago
52f55e0542
Allow room tags to have asssociated content, and return that content in the m.tag events
9 years ago
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
9 years ago
65066a76b3
Add the m.tags event to a ``private_user_data`` key rather than including it under the ``ephemeral`` key
9 years ago
9b0d20315a
Add the tags module to the specification targets
9 years ago
12e33a3b09
Document a v2 api for setting tags on rooms
9 years ago
7c250f91ff
Merge pull request #127 from matrix-org/daniel/exposedrooms
...
Allow history to be noted as world-readable
9 years ago
4823a133cd
Merge pull request #124 from matrix-org/clarify_scale_crop
...
Clarify 'scale' & 'crop' resize methods
9 years ago
67880686d5
Allow history to be noted as world-readable
...
SPEC-237
9 years ago
01064369a4
Add some clarification on the difference between 'scale' and 'crop' resize methods
9 years ago
e3e8026025
Fix list formatting so that we aren't including everything in blockquotes
9 years ago
f0c74a9c83
Merge pull request #96 from matrix-org/erikj/search_actual
...
Add search API
9 years ago
4a558ad63b
Typo
9 years ago
a9a9067d7e
Merge pull request #114 from matrix-org/daniel/3pidtosigned
...
Update 3pid invite section to reflect signed property
9 years ago
1d01f69c3c
Merge remote-tracking branch 'origin/master' into erikj/search_actual
9 years ago
111ca99519
Clarify that this doesn't include events that occurred after you left the room.
9 years ago
ae90d15b3c
Add m.room.avatar
9 years ago
c70067dd1e
Simplify language
9 years ago
6161a920b6
Update 3pid invite section to reflect signed property
9 years ago
eb59b8e9d1
Mention count
9 years ago
a6cb2e4339
Mention rank
9 years ago
24e36adbe3
Mention e2e encryption
9 years ago
770cfbc5de
Be explicit about the events the search is performed over
9 years ago
906c59385f
s/had/has/
9 years ago
c47a94658a
Mention supported keys
9 years ago
af347baa68
Better phrasing
9 years ago
96a4996c76
Mention search categories
9 years ago
3a2c8cd4b3
Merge pull request #91 from matrix-org/module-history-vis
...
History visibility module
9 years ago
5aad67f74d
Review comments round III
9 years ago
c5dc383668
Merge pull request #85 from matrix-org/module-im
...
Instant messaging module
9 years ago
507cb29e39
Review comments round deux
9 years ago
f51ee70633
Review comments round 2
9 years ago
1229ad24dd
Merge pull request #103 from matrix-org/spec-165-mxc-security
...
SPEC-165: Outline directory traversal attacks on MXC URIs
9 years ago
728b5a7951
Add very short summary
9 years ago
007bb1a69a
Add extra new line
9 years ago
d8bc0c9315
Add search module
9 years ago
44b19a8b0e
SPEC-165: Outline directory traversal attacks on MXC URIs
9 years ago
3608f3a282
SPEC-144 : Use https examples not http.
9 years ago
4170dbd5cf
Review comments
9 years ago
173d00cea0
Review comments
9 years ago
2502ca7ac6
Merge branch 'master' into daniel/threepidinvites-2
...
Conflicts:
specification/targets.yaml
9 years ago
4a1fb74897
Review comments
9 years ago
8f5c796884
Linkify 'pushers'
9 years ago
e378de8379
Shuffle history visibility module to be in the module format
9 years ago
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.
9 years ago
dc3c02aff5
Review comments
9 years ago
21a40b317d
Merge branch 'master' into daniel/threepidinvites-2
9 years ago
9c95ee5c1f
Modify wording and formatting
9 years ago
31ae4b3859
Swaggerify push notification API
...
Edit units.py to support nested JSON request keys
9 years ago
a9618a981b
Swaggerify the /enabled endpoint
9 years ago
56ce432399
Get profile tag keys displaying correctly.
9 years ago
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.
9 years ago
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.
9 years ago
d3ed517ebf
Finish laying out rough sections
9 years ago
a7400508c6
Define module titles from the template
9 years ago
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.
9 years ago
91ca36509b
Flesh out IM module
9 years ago
8e5c832ff9
Flesh out more of the IM module
9 years ago
47cf958b54
Merge branch 'master' into module-im
9 years ago
8c092e3d11
Merge pull request #74 from matrix-org/module-presence
...
Presence module
9 years ago
417c5b53c4
Remove duplicate sentences from merge conflicts
9 years ago
b29fdebec2
Give example of verification dance
9 years ago
458383585f
Stub sections
9 years ago
ead79614ff
Merge pull request #78 from matrix-org/module-typing2
...
Typing module
9 years ago
9d8dc7971d
Review comments
9 years ago
09ac367847
Merge branch 'master' into module-content-repo
...
Conflicts:
templating/matrix_templates/units.py
9 years ago
4dabcd112e
Remove redundant info now we have the http api template. Minor tweaks to display of schema with no names but a type
9 years ago
af7d2ca9fc
Update 3pid invite spec
...
This takes into account:
1) That finding the existing servers of a room is hard
2) Federation
9 years ago
87b6dd845e
Flesh out content repo; modify templating to support headers
...
Edit content-repo.yaml to include examples and headers.
Restructure content module to conform to the module template.
Adjust the HTTP API template to give 1 more char to the response
param to fit "Content-Disposition" correctly.
Edit the templating system to support displaying enums for
swagger APIs (before it was just JSON schema). Also add support
for introspecting headers from swagger. Finally, replace - with
_ when forming the {{ template_var }} else things whine.
9 years ago
8aad238cda
Merge pull request #80 from matrix-org/module-receipts
...
Receipts module
9 years ago
da2be7eae4
Merge branch 'master' into module-voip
...
Conflicts:
specification/modules/voip_events.rst
9 years ago
1520f3647f
Merge branch 'master' into module-typing2
...
Conflicts:
specification/modules/typing_notifications.rst
9 years ago
cc6f256b24
Merge branch 'master' into module-presence
...
Conflicts:
specification/modules/presence.rst
9 years ago
6000887201
Merge branch 'master' into module-receipts
...
Conflicts:
specification/modules/receipts.rst
9 years ago
c972dad8b3
Flesh out receipts module. Add receipts swagger
...
Add templating support for v2 apis.
9 years ago
4a7a682c0f
Merge pull request #65 from matrix-org/spec-feature-profiles
...
Spec feature profiles
9 years ago
365a9076b9
Add nested dict template support; Add x-pattern
...
For cases where event schema specify `patternProperties` it would be nice
to give that pattern a "human-readable" form rather than a raw regex. This
is now supported by specifying `x-pattern` in the value part of the specified
pattern e.g. `patternProperties:{ "^.*":{ x-pattern: "$THING", ... } }`
Templating had limited record type descriptions limited to value primitives
e.g. `{string: integer}`. It now supports inspecting the values recursively
if the value is `object`.
Updated `m.receipt` to take both these points into account to make it read
better. Tweak receipt module text.
9 years ago
3b73b07bab
Clarifications that room invites are m.call.invites not actual invites
9 years ago
e82661413e
Add /turnServer endpoint
9 years ago
6c3e70d272
Start fleshing out voip module
9 years ago
097dc50180
Minor tweaks
9 years ago
a82f2ad4ac
Flesh out typing module
9 years ago
2b7e02c080
Add sections for typing. Add swagger, JSON schema and example m.typing event
9 years ago
52f6496cf0
Merge branch 'master' into module-presence
9 years ago
4e1e82f995
Fix paragraph CSS and adjust where paragraphs are in the RST
...
The CSS for `nature.css` was such that it was preventing `p` tags from
having sufficient vertical whitespace. This meant that you couldn't insert
any kind of spacing between lengthy sections (they just appeared as new lines).
This PR fixes this so you can actually have some whitespace between paragraphs.
As a result of this change, some parts of the spec appeared to have too much
whitespace. These were often sections which shouldn't have begun a new
paragraph anyway (e.g. a single sentence being an entire paragraph, `TODO`
blocks resulting in new paragraphs). This PR fixes the most offending areas
where we shouldn't have been inserting new paragraphs.
9 years ago
069e4e39f4
Move presence specific sections from intro to presence module
9 years ago
0a04672d76
Start converting the presence module. Add Rationale admonition.
9 years ago
Mark Haines