4230e375fa
Merge pull request #1465 from Zil0/key_sharing
...
Document key sharing events
7 years ago
26d5a24b88
Merge remote matrix-org/master
7 years ago
e4f8c23972
Merge pull request #1562 from turt2live/travis/c2s/html-formatting
...
Define the supported HTML subset for message events
7 years ago
ee2ebe6792
Merge pull request #1568 from turt2live/travis/c2s/invite-room-state
...
Move `invite_room_state` to the correct place in the client-server API
7 years ago
e9e93b0eec
Move `invite_room_state` to the correct place in the client-server API
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1350
7 years ago
aa294fac06
Define the supported HTML subset for message events
...
Also clarify that `m.notice` messages can support HTML.
Fixes https://github.com/matrix-org/matrix-doc/issues/1559
Fixes https://github.com/matrix-org/matrix-doc/issues/1560
7 years ago
ef41b5c2bf
Server ACLs
...
Implements the proposal for https://github.com/matrix-org/matrix-doc/issues/1383
7 years ago
019c290fa2
document m.forwarded_room_key
7 years ago
2d8a321b46
document key sharing and m.room_key_request
7 years ago
661176cb3a
Olm m.room.encrypted example
7 years ago
8732378da2
add required room ids
7 years ago
c60109d235
complete m.room_key documentation
7 years ago
3a8d13df60
add missing m.room.encryption properties
7 years ago
e5005b2d0f
document E2E events
...
This was written by Richard van der Hoff.
7 years ago
57571ea4ce
Merge branch 'master' of github.com:matrix-org/matrix-doc into notifications/room
7 years ago
55e4e90ab1
Document message formats as-is
...
This is likely to later be replaced by mixins, however this is being documented now so clients aren't left in the dark.
Fixes https://github.com/matrix-org/matrix-doc/issues/917
8 years ago
992bc8828a
Merge branches 'master' and 'notifications/room' of github.com:matrix-org/matrix-doc into notifications/room
8 years ago
1e656d836e
spec notifications key on power level event and provide @room in example
8 years ago
8d05f80cec
Sticker messages (m.sticker) ( #1158 )
8 years ago
af74790681
Merge remote-tracking branch 'matrix-org/master' into travis/m.ignored_user_list
8 years ago
eb8c3255bf
Remove extraneous comma from m.presence schema
...
This causes the build to fail. Fixes #1146
Signed-off-by: Travis Ralston <travpc@gmail.com>
8 years ago
d37ed0876f
Merge branch 'master' into travis/m.ignored_user_list
8 years ago
a0dda3cae2
Merge branch 'master' into travis/m.tag
8 years ago
e862ef60ae
Spec ignoring users
...
Adds https://github.com/matrix-org/matrix-doc/issues/528
Signed-off-by: Travis Ralston <travpc@gmail.com>
8 years ago
a3f006353c
Tag ordering is defined as a number between 0 and 1, not strings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
8 years ago
a488bd5503
Make m.presence match what synapse returns
...
Considering this is the behaviour that is embedded into most client libraries and the most popular homeserver, it should be adopted as the standard.
Signed-off-by: Travis Ralston <travpc@gmail.com>
8 years ago
a1265a274b
Add spec for m.room.pinned_events
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
8 years ago
0b74492d67
Fix membership on third-party invite upgrade ( #995 )
8 years ago
f8ce497bd6
Fix inconsistency: `join_rules` => `join_rule`
...
All other docs do not have `join_rules` but `join_rule`
This PR fix this inconsistency.
Mentioned by @digital:sorunome.de in [#matrix-dev:matrix.org](https://matrix.to/#/!XqBunHwQIXUiqCaoxq:matrix.org/$150142347531959wjGGm:sorunome.de )
8 years ago
750d980bc0
Room member ( #950 )
...
* Fixed an incorrect membership on example
* Added precision on membership upon profile update
* Changed first example into a join
* Changed the state/{eventType}/{stateKey} example with an actual state key
9 years ago
852f4edead
redacts is an eventID not a roomID (! -> $)
9 years ago
05001bcaa6
Fix whitepace
9 years ago
29e33deeb5
Fix m.location example
9 years ago
85bc989c02
pr feedback
9 years ago
cade909e25
Fix inconsistencies regarding redacted_because
...
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
9 years ago
4f37e4ece0
Merge pull request #342 from matrix-org/erikj/presence
...
Fix and correctly document presence's currently_active
10 years ago
c83940750c
Update m.presence
10 years ago
adb5768731
m.room.power_levels: clarify documentation
...
- clarify description and add text for invite, ban, etc.
- the keys aren't required. Document their defaults
- add 'invite' to example
10 years ago
ea170e5dca
m.third_party_invite: Allow multiple public keys
10 years ago
9bfe86f474
Add display_name to 3pid invites in m.room.member
10 years ago
aa4ed10821
Unify v1 and v2 event schemas
10 years ago
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.
10 years ago
c5f457cee9
Merge pull request #132 from matrix-org/markjh/room_tags
...
Document a v2 api for setting tags on rooms
10 years ago
3b390bff3c
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
10 years ago
071edcd86e
Merge branch 'master' into daniel/multipleexamples
10 years ago
e72151f2c3
Specify guest room access
...
This was reviewed as PR #150 and merged from daniel/anonymousaccess
10 years ago
161441fa3a
Update 3pid spec based on new implementation
10 years ago
d53814097f
Add example content to the tags in example tag events
10 years ago
52f55e0542
Allow room tags to have asssociated content, and return that content in the m.tag events
10 years ago
9f4d81308d
Pull out separate invite_room_state example
10 years ago
Hubert Chathi