Paul Evans
|
eb61f018c2
|
Merge pull request #144 from matrix-org/paul/small-fixes
Don't mark 'aliases' on m.room.canonical_alias as required
|
9 years ago |
|
Mark Haines
|
c5f457cee9
|
Merge pull request #132 from matrix-org/markjh/room_tags
Document a v2 api for setting tags on rooms
|
9 years ago |
|
Daniel Wagner-Hall
|
4faede73a1
|
Merge branch 'master' into daniel/multipleexamples
|
9 years ago |
|
Mark Haines
|
5bae15d47b
|
Merge branch 'master' into markjh/room_tags
Conflicts:
api/client-server/v2_alpha/sync.yaml
|
9 years ago |
|
Mark Haines
|
3b390bff3c
|
Merge branch 'master' into markjh/room_tags
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
|
9 years ago |
|
Daniel Wagner-Hall
|
4d3175fc8b
|
Note that invite_room_state is optional
|
9 years ago |
|
Daniel Wagner-Hall
|
071edcd86e
|
Merge branch 'master' into daniel/multipleexamples
|
9 years ago |
|
Daniel Wagner-Hall
|
e72151f2c3
|
Specify guest room access
This was reviewed as PR #150 and merged from daniel/anonymousaccess
|
9 years ago |
|
Daniel Wagner-Hall
|
2734f9f9f2
|
Merge branch 'master' into daniel/multipleexamples
Conflicts:
specification/modules/third_party_invites.rst
|
9 years ago |
|
Daniel Wagner-Hall
|
161441fa3a
|
Update 3pid spec based on new implementation
|
9 years ago |
|
Mark Haines
|
ebc0237109
|
Add the missing titles to the schema
|
9 years ago |
|
Paul "LeoNerd" Evans
|
30a4f17420
|
Don't mark 'aliases' on m.room.canonical_alias as required, because it isn't.
|
9 years ago |
|
Mark Haines
|
d53814097f
|
Add example content to the tags in example tag events
|
9 years ago |
|
Mark Haines
|
fba3c04e42
|
Apparently the spec generator breaks if the title in a schema is too long
|
9 years ago |
|
Mark Haines
|
bcb8fac53c
|
Add a description for the tag event
|
9 years ago |
|
Mark Haines
|
52f55e0542
|
Allow room tags to have asssociated content, and return that content in the m.tag events
|
9 years ago |
|
Daniel Wagner-Hall
|
9f4d81308d
|
Pull out separate invite_room_state example
|
9 years ago |
|
Daniel Wagner-Hall
|
810922bb38
|
Fix schema validator for multiple examples
|
9 years ago |
|
Daniel Wagner-Hall
|
176f919fc8
|
Show multiple examples where present
|
9 years ago |
|
Daniel Wagner-Hall
|
b92a0f2b4d
|
Remove extra trailing comma
|
9 years ago |
|
Daniel Wagner-Hall
|
81a60a25cc
|
Update 3pid spec based on new implementation
|
9 years ago |
|
Mark Haines
|
12e33a3b09
|
Document a v2 api for setting tags on rooms
|
9 years ago |
|
Daniel Wagner-Hall
|
67880686d5
|
Allow history to be noted as world-readable
SPEC-237
|
9 years ago |
|
Kegsay
|
074c7d480c
|
Merge pull request #113 from matrix-org/invite-room-state
Add invite_room_state to spec
|
9 years ago |
|
Daniel Wagner-Hall
|
a9a9067d7e
|
Merge pull request #114 from matrix-org/daniel/3pidtosigned
Update 3pid invite section to reflect signed property
|
9 years ago |
|
Kegan Dougal
|
bbd3f8072c
|
Review comments
|
9 years ago |
|
Daniel Wagner-Hall
|
b7355b0fa5
|
Merge pull request #117 from matrix-org/daniel/jenkins
Give useful error if z-schema is missing
|
9 years ago |
|
Daniel Wagner-Hall
|
b2aae762fc
|
Give useful error if z-schema is missing
|
9 years ago |
|
Daniel Wagner-Hall
|
f51e031066
|
Fix JSON
|
9 years ago |
|
Kegan Dougal
|
ae90d15b3c
|
Add m.room.avatar
|
9 years ago |
|
Daniel Wagner-Hall
|
a38e0862cf
|
Fix required field names
|
9 years ago |
|
Daniel Wagner-Hall
|
6161a920b6
|
Update 3pid invite section to reflect signed property
|
9 years ago |
|
Kegan Dougal
|
83d21484df
|
Oopsie
|
9 years ago |
|
Kegan Dougal
|
a8d8412068
|
Add invite_room_state example.
|
9 years ago |
|
Kegan Dougal
|
d39a9082a0
|
Add invite_room_state to spec. Flesh out info.
|
9 years ago |
|
Kegsay
|
604e268add
|
Merge pull request #105 from matrix-org/spec-177-events-max-len
Add in size limits as per SPEC-222
|
9 years ago |
|
Kegsay
|
c5dc383668
|
Merge pull request #85 from matrix-org/module-im
Instant messaging module
|
9 years ago |
|
Kegan Dougal
|
6a0595bc46
|
Add in size limits as per SPEC-222
|
9 years ago |
|
Kegan Dougal
|
4170dbd5cf
|
Review comments
|
9 years ago |
|
Daniel Wagner-Hall
|
dc3c02aff5
|
Review comments
|
9 years ago |
|
Daniel Wagner-Hall
|
21a40b317d
|
Merge branch 'master' into daniel/threepidinvites-2
|
9 years ago |
|
Kegan Dougal
|
8e5c832ff9
|
Flesh out more of the IM module
|
9 years ago |
|
Erik Johnston
|
3b4c3522e6
|
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/disable_federation
|
9 years ago |
|
Kegsay
|
ead79614ff
|
Merge pull request #78 from matrix-org/module-typing2
Typing module
|
9 years ago |
|
Daniel Wagner-Hall
|
9d8dc7971d
|
Review comments
|
9 years ago |
|
Daniel Wagner-Hall
|
9cda004848
|
Fix ref
|
9 years ago |
|
Daniel Wagner-Hall
|
fdccf35c47
|
Banish more tabs
|
9 years ago |
|
Daniel Wagner-Hall
|
e996933a29
|
Banish the tabs
|
9 years ago |
|
Daniel Wagner-Hall
|
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 |
|
Kegan Dougal
|
1520f3647f
|
Merge branch 'master' into module-typing2
Conflicts:
specification/modules/typing_notifications.rst
|
9 years ago |