Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-25 18:38:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
939 commits 30 branches 42 tags 32 MiB
Commit graph

939 commits

This branch
This branch
All branches
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
Mark Haines 0639f885df Merge pull request #125 from matrix-org/markjh/blockquote_css 
Move css into a css subdirectory.
 2015-10-23 12:59:32 +01:00
Mark Haines df443c10ac Move css into a css subdirectory. 
Add css to put a bar next to blockquotes.
 2015-10-23 11:58:06 +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 879c6fc24b Merge pull request #122 from matrix-org/trustleo 
Trust Leo
 2015-10-22 16:32:04 +01:00
Daniel Wagner-Hall 82d4ea199f Trust Leo 2015-10-22 16:09:01 +01:00
Kegsay 73142fe76e Merge pull request #108 from matrix-org/appservice-swagger 
Swaggerify application services
 2015-10-21 11:29:59 +01:00
Kegan Dougal f95d19cecd Merge branch 'master' into appservice-swagger 
Conflicts:
	specification/application_service_api.rst
 2015-10-21 09:55:53 +01:00
Kegan Dougal 4c3e1b9ed3 Find replace fail 2015-10-21 09:53:25 +01:00
Kegan Dougal bd539c72b4 More review comments 2015-10-21 09:52:44 +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 74d42f0142 Allow rejecting invitations 2015-10-20 11:08:22 +01:00
Paul Evans 84a8663019 Merge pull request #115 from matrix-org/paul/event-redaction 
Initial attempt at describing the event redaction algorithm
 2015-10-19 17:44:22 +01:00
Paul "LeoNerd" Evans 9252b3e1a2 Fix typo s/he/the/ 2015-10-19 17:44:09 +01:00
Paul "LeoNerd" Evans bfa9937bdc Minor wording updates 2015-10-19 17:28:31 +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
Kegsay 6546068c63 Merge pull request #101 from matrix-org/spec-182-asapi-user-creation 
SPEC-182: Make it clearer how ASes are supposed to create users
 2015-10-19 13:39:50 +01:00
Kegan Dougal f3088a0674 Merge branch 'master' into spec-182-asapi-user-creation 2015-10-19 13:39:21 +01:00
Kegsay c032eafd4e Merge pull request #109 from matrix-org/registration-swagger 
Swaggerify /register endpoint
 2015-10-19 13:38:36 +01:00
Kegan Dougal 26f27d95fb Merge branch 'master' into registration-swagger 
Conflicts:
	specification/client_server_api.rst
 2015-10-19 13:34:41 +01:00
Kegan Dougal f450fc1db6 Typo 2015-10-19 13:32:43 +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
Kegsay a2aa3cc00e Merge pull request #116 from matrix-org/room-avatar 
Add m.room.avatar
 2015-10-19 13:19:43 +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 c70067dd1e Simplify language 2015-10-19 10:44:26 +01:00
Daniel Wagner-Hall cf3d75103c Merge pull request #111 from matrix-org/daniel/as 
Remove lies about OAuth which doesn't exist
 2015-10-19 10:37:21 +01:00
Daniel Wagner-Hall 22fdb8f911 Merge branch 'master' into daniel/as 2015-10-19 10:37:12 +01:00
Paul "LeoNerd" Evans 29720cd152 Initial attempt at describing the event redaction algorithm 2015-10-16 19:00:36 +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 5881faeb83 Merge pull request #94 from matrix-org/proofing 
Initial improvements to the Client-Server API section
 2015-10-16 15:58:42 +01:00
Kegan Dougal 62d53b4f33 Review comments round III 2015-10-16 15:58:11 +01:00
Kegan Dougal 85a6a5a530 Merge branch 'master' into proofing 2015-10-16 15:23:07 +01:00
Kegan Dougal 4bb042daeb Review comments round II 2015-10-16 15:22:50 +01:00
Kegsay fd591f2013 Merge pull request #107 from matrix-org/proofing2 
Proofing
 2015-10-16 14:19:26 +01:00
Kegan Dougal e0fe3c42c8 Review comments 2015-10-16 14:19:00 +01:00
Kegan Dougal 6770d6b2d6 Review comments 2015-10-16 14:05:18 +01:00
Daniel Wagner-Hall 20b11281ea Remove lies about OAuth which doesn't exist 2015-10-16 13:11:10 +01:00
Erik Johnston 716c5b7a8b Add 400 and 429 response codes 2015-10-16 10:26:14 +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