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 |
|
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 |
|
Kegan Dougal
|
ae90d15b3c
|
Add m.room.avatar
|
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 |
|
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 |
|
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 |
|
Erik Johnston
|
24e36adbe3
|
Mention e2e encryption
|
9 years ago |
|
Erik Johnston
|
770cfbc5de
|
Be explicit about the events the search is performed over
|
9 years ago |
|
Erik Johnston
|
cfca4a6c09
|
s/creteria/criteria/
|
9 years ago |
|
Erik Johnston
|
906c59385f
|
s/had/has/
|
9 years ago |
|
Kegan Dougal
|
3d087df538
|
Kill number prefixes for good
|
9 years ago |
|
Kegan Dougal
|
6b72ddfb8c
|
Spelling and typos
|
9 years ago |
|
Kegan Dougal
|
08ccacae17
|
Merge branch 'master' into proofing
Conflicts:
specification/0-intro.rst
|
9 years ago |
|
Erik Johnston
|
c47a94658a
|
Mention supported keys
|
9 years ago |
|
Kegsay
|
3146b52f83
|
Merge pull request #102 from matrix-org/spec-207-asapi-unique-tokens
SPEC-207: Add a warning about needing AS tokens to be unique and why
|
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 |
|
Kegan Dougal
|
5de63b4f45
|
Merge branch 'master' into proofing
Conflicts:
specification/0-intro.rst
|
9 years ago |
|
Erik Johnston
|
af347baa68
|
Better phrasing
|
9 years ago |
|
Erik Johnston
|
96a4996c76
|
Mention search categories
|
9 years ago |
|
Kegsay
|
3a2c8cd4b3
|
Merge pull request #91 from matrix-org/module-history-vis
History visibility module
|
9 years ago |
|
Kegan Dougal
|
5aad67f74d
|
Review comments round III
|
9 years ago |
|
Kegsay
|
c5dc383668
|
Merge pull request #85 from matrix-org/module-im
Instant messaging module
|
9 years ago |
|
Kegan Dougal
|
507cb29e39
|
Review comments round deux
|
9 years ago |
|
Kegan Dougal
|
f51ee70633
|
Review comments round 2
|
9 years ago |
|
Kegan Dougal
|
c82c07ddd2
|
Review comments
|
9 years ago |
|
Kegan Dougal
|
c4d1b56843
|
Add a comment about enforcement.
|
9 years ago |
|
Kegsay
|
e5559e4ea5
|
Merge pull request #106 from matrix-org/erikj/newline_gendoc_STOP_BEING_CRANKY
gendoc should just add newlines rather than complaining about the lack thereof
|
9 years ago |
|
Kegsay
|
6a70828400
|
Merge pull request #95 from matrix-org/rav/login-api-fixes
Clean up some untruths in the login api doc
|
9 years ago |
|
Kegsay
|
1229ad24dd
|
Merge pull request #103 from matrix-org/spec-165-mxc-security
SPEC-165: Outline directory traversal attacks on MXC URIs
|
9 years ago |
|
Kegsay
|
bc0ab32cfd
|
Merge pull request #99 from matrix-org/spec-144-https-examples
SPEC-144 : Use https examples not http
|
9 years ago |
|
Kegsay
|
dd5b41e99c
|
Merge pull request #104 from matrix-org/spec-205-password-strength
SPEC-205: Warn about password strengths in m.login.password section
|
9 years ago |
|
Kegan Dougal
|
e6eb19c461
|
Review comments
|
9 years ago |