Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-24 16:23:41 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1179 commits 28 branches 42 tags 33 MiB
Commit graph

113 commits

Author SHA1 Message Date
Paul Evans eb61f018c2 Merge pull request #144 from matrix-org/paul/small-fixes 
Don't mark 'aliases' on m.room.canonical_alias as required
 2015-11-27 15:42:36 +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
Daniel Wagner-Hall 4faede73a1 Merge branch 'master' into daniel/multipleexamples 2015-11-25 14:29:33 +00:00
Mark Haines 5bae15d47b Merge branch 'master' into markjh/room_tags 
Conflicts:
	api/client-server/v2_alpha/sync.yaml
 2015-11-20 18:39:15 +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
Daniel Wagner-Hall 4d3175fc8b Note that invite_room_state is optional 2015-11-12 10:45:57 +00:00
Daniel Wagner-Hall 071edcd86e Merge branch 'master' into daniel/multipleexamples 2015-11-10 13:22:35 +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 2734f9f9f2 Merge branch 'master' into daniel/multipleexamples 
Conflicts:
	specification/modules/third_party_invites.rst
 2015-11-05 18:33:31 +00:00
Daniel Wagner-Hall 161441fa3a Update 3pid spec based on new implementation 2015-11-05 18:11:20 +00:00
Mark Haines ebc0237109 Add the missing titles to the schema 2015-11-03 19:35:44 +00:00
Paul "LeoNerd" Evans 30a4f17420 Don't mark 'aliases' on m.room.canonical_alias as required, because it isn't. 2015-11-03 16:15:36 +00:00
Mark Haines d53814097f Add example content to the tags in example tag events 2015-11-03 15:57:06 +00:00
Mark Haines fba3c04e42 Apparently the spec generator breaks if the title in a schema is too long 2015-11-03 15:48:30 +00:00
Mark Haines bcb8fac53c Add a description for the tag event 2015-11-03 15:46:01 +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
Daniel Wagner-Hall 9f4d81308d Pull out separate invite_room_state example 2015-10-30 16:21:50 +00:00
Daniel Wagner-Hall 810922bb38 Fix schema validator for multiple examples 2015-10-28 15:06:44 +00:00
Daniel Wagner-Hall 176f919fc8 Show multiple examples where present 2015-10-28 15:00:53 +00:00
Daniel Wagner-Hall b92a0f2b4d Remove extra trailing comma 2015-10-28 14:49:41 +00:00
Daniel Wagner-Hall 81a60a25cc Update 3pid spec based on new implementation 2015-10-28 14:46:10 +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 67880686d5 Allow history to be noted as world-readable 
SPEC-237
 2015-10-23 14:02:53 +01:00
Kegsay 074c7d480c Merge pull request #113 from matrix-org/invite-room-state 
Add invite_room_state to spec
 2015-10-21 09:37:44 +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
Kegan Dougal bbd3f8072c Review comments 2015-10-19 13:28:44 +01:00
Daniel Wagner-Hall b7355b0fa5 Merge pull request #117 from matrix-org/daniel/jenkins 
Give useful error if z-schema is missing
 2015-10-19 13:24:00 +01:00
Daniel Wagner-Hall b2aae762fc Give useful error if z-schema is missing 2015-10-19 12:36:49 +01:00
Daniel Wagner-Hall f51e031066 Fix JSON 2015-10-19 12:36:10 +01:00
Kegan Dougal ae90d15b3c Add m.room.avatar 2015-10-19 10:46:07 +01:00
Daniel Wagner-Hall a38e0862cf Fix required field names 2015-10-16 18:56:07 +01:00
Daniel Wagner-Hall 6161a920b6 Update 3pid invite section to reflect signed property 2015-10-16 18:29:20 +01:00
Kegan Dougal 83d21484df Oopsie 2015-10-16 16:54:40 +01:00
Kegan Dougal a8d8412068 Add invite_room_state example. 2015-10-16 16:48:18 +01:00
Kegan Dougal d39a9082a0 Add invite_room_state to spec. Flesh out info. 2015-10-16 16:43:33 +01:00
Kegsay 604e268add Merge pull request #105 from matrix-org/spec-177-events-max-len 
Add in size limits as per SPEC-222
 2015-10-15 11:08:28 +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 6a0595bc46 Add in size limits as per SPEC-222 2015-10-14 16:15:55 +01:00
Kegan Dougal 4170dbd5cf Review comments 2015-10-13 11:29:54 +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 8e5c832ff9 Flesh out more of the IM module 2015-10-05 13:45:23 +01:00
Erik Johnston 3b4c3522e6 Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/disable_federation 2015-10-05 09:17:28 +01:00
Kegsay ead79614ff Merge pull request #78 from matrix-org/module-typing2 
Typing module
 2015-10-02 14:36:30 +01:00
Daniel Wagner-Hall 9d8dc7971d Review comments 2015-10-02 08:33:12 -05:00
Daniel Wagner-Hall 9cda004848 Fix ref 2015-10-01 22:27:19 -05:00
Daniel Wagner-Hall fdccf35c47 Banish more tabs 2015-10-01 22:23:24 -05:00
Daniel Wagner-Hall e996933a29 Banish the tabs 2015-10-01 22:21:34 -05:00
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
 2015-10-01 22:19:11 -05:00
Kegan Dougal 1520f3647f Merge branch 'master' into module-typing2 
Conflicts:
	specification/modules/typing_notifications.rst
 2015-10-01 15:47:46 +01:00