Mark Haines
|
0639f885df
|
Merge pull request #125 from matrix-org/markjh/blockquote_css
Move css into a css subdirectory.
|
9 years ago |
|
Mark Haines
|
df443c10ac
|
Move css into a css subdirectory.
Add css to put a bar next to blockquotes.
|
9 years ago |
|
Erik Johnston
|
f0c74a9c83
|
Merge pull request #96 from matrix-org/erikj/search_actual
Add search API
|
9 years ago |
|
Erik Johnston
|
4a558ad63b
|
Typo
|
9 years ago |
|
Daniel Wagner-Hall
|
879c6fc24b
|
Merge pull request #122 from matrix-org/trustleo
Trust Leo
|
9 years ago |
|
Daniel Wagner-Hall
|
82d4ea199f
|
Trust Leo
|
9 years ago |
|
Kegsay
|
73142fe76e
|
Merge pull request #108 from matrix-org/appservice-swagger
Swaggerify application services
|
9 years ago |
|
Kegan Dougal
|
f95d19cecd
|
Merge branch 'master' into appservice-swagger
Conflicts:
specification/application_service_api.rst
|
9 years ago |
|
Kegan Dougal
|
4c3e1b9ed3
|
Find replace fail
|
9 years ago |
|
Kegan Dougal
|
bd539c72b4
|
More review comments
|
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
|
74d42f0142
|
Allow rejecting invitations
|
9 years ago |
|
Paul Evans
|
84a8663019
|
Merge pull request #115 from matrix-org/paul/event-redaction
Initial attempt at describing the event redaction algorithm
|
9 years ago |
|
Paul "LeoNerd" Evans
|
9252b3e1a2
|
Fix typo s/he/the/
|
9 years ago |
|
Paul "LeoNerd" Evans
|
bfa9937bdc
|
Minor wording updates
|
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 |
|
Erik Johnston
|
1d01f69c3c
|
Merge remote-tracking branch 'origin/master' into erikj/search_actual
|
9 years ago |
|
Erik Johnston
|
111ca99519
|
Clarify that this doesn't include events that occurred after you left the room.
|
9 years ago |
|
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
|
9 years ago |
|
Kegan Dougal
|
f3088a0674
|
Merge branch 'master' into spec-182-asapi-user-creation
|
9 years ago |
|
Kegsay
|
c032eafd4e
|
Merge pull request #109 from matrix-org/registration-swagger
Swaggerify /register endpoint
|
9 years ago |
|
Kegan Dougal
|
26f27d95fb
|
Merge branch 'master' into registration-swagger
Conflicts:
specification/client_server_api.rst
|
9 years ago |
|
Kegan Dougal
|
f450fc1db6
|
Typo
|
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 |
|
Kegsay
|
a2aa3cc00e
|
Merge pull request #116 from matrix-org/room-avatar
Add m.room.avatar
|
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
|
c70067dd1e
|
Simplify language
|
9 years ago |
|
Daniel Wagner-Hall
|
cf3d75103c
|
Merge pull request #111 from matrix-org/daniel/as
Remove lies about OAuth which doesn't exist
|
9 years ago |
|
Daniel Wagner-Hall
|
22fdb8f911
|
Merge branch 'master' into daniel/as
|
9 years ago |
|
Paul "LeoNerd" Evans
|
29720cd152
|
Initial attempt at describing the event redaction algorithm
|
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
|
5881faeb83
|
Merge pull request #94 from matrix-org/proofing
Initial improvements to the Client-Server API section
|
9 years ago |
|
Kegan Dougal
|
62d53b4f33
|
Review comments round III
|
9 years ago |
|
Kegan Dougal
|
85a6a5a530
|
Merge branch 'master' into proofing
|
9 years ago |
|
Kegan Dougal
|
4bb042daeb
|
Review comments round II
|
9 years ago |
|
Kegsay
|
fd591f2013
|
Merge pull request #107 from matrix-org/proofing2
Proofing
|
9 years ago |
|
Kegan Dougal
|
e0fe3c42c8
|
Review comments
|
9 years ago |
|
Kegan Dougal
|
6770d6b2d6
|
Review comments
|
9 years ago |
|
Daniel Wagner-Hall
|
20b11281ea
|
Remove lies about OAuth which doesn't exist
|
9 years ago |
|
Erik Johnston
|
716c5b7a8b
|
Add 400 and 429 response codes
|
9 years ago |
|
Erik Johnston
|
eb59b8e9d1
|
Mention count
|
9 years ago |
|
Erik Johnston
|
a6cb2e4339
|
Mention rank
|
9 years ago |
|
Kegan Dougal
|
eca98af896
|
Swaggerify /register endpoint
Need to move registration/login/auth sections around once #94 lands.
|
9 years ago |