Commit graph

898 commits

Author SHA1 Message Date
Paul "LeoNerd" Evans
e38e4788f2 Spell 'cryptographic' correctly 2015-10-19 18:29:37 +01:00
Paul "LeoNerd" Evans
228acc59aa Capture cryptographic test vectors for JSON or event signing from source code 2015-10-19 18:26:52 +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
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
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
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
Daniel Wagner-Hall
20b11281ea Remove lies about OAuth which doesn't exist 2015-10-16 13:11:10 +01:00
Kegan Dougal
eca98af896 Swaggerify /register endpoint
Need to move registration/login/auth sections around once #94 lands.
2015-10-15 16:38:12 +01:00
Kegan Dougal
3d087df538 Kill number prefixes for good 2015-10-15 13:40:05 +01:00
Kegan Dougal
6b72ddfb8c Spelling and typos 2015-10-15 13:36:43 +01:00
Kegan Dougal
08ccacae17 Merge branch 'master' into proofing
Conflicts:
	specification/0-intro.rst
2015-10-15 13:26:37 +01:00
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
2015-10-15 11:08:50 +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
Kegan Dougal
5de63b4f45 Merge branch 'master' into proofing
Conflicts:
	specification/0-intro.rst
2015-10-15 11:06:30 +01:00
Kegsay
3a2c8cd4b3 Merge pull request #91 from matrix-org/module-history-vis
History visibility module
2015-10-15 11:02:24 +01:00
Kegan Dougal
5aad67f74d Review comments round III 2015-10-15 11:01:11 +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
507cb29e39 Review comments round deux 2015-10-15 10:37:15 +01:00
Kegan Dougal
f51ee70633 Review comments round 2 2015-10-15 10:19:51 +01:00
Kegan Dougal
c82c07ddd2 Review comments 2015-10-15 09:58:39 +01:00
Kegan Dougal
c4d1b56843 Add a comment about enforcement. 2015-10-15 09:57:21 +01:00
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
2015-10-15 09:56:04 +01:00
Kegsay
6a70828400 Merge pull request #95 from matrix-org/rav/login-api-fixes
Clean up some untruths in the login api doc
2015-10-15 09:55:31 +01:00
Kegsay
1229ad24dd Merge pull request #103 from matrix-org/spec-165-mxc-security
SPEC-165: Outline directory traversal attacks on MXC URIs
2015-10-14 17:48:59 +01:00
Kegsay
bc0ab32cfd Merge pull request #99 from matrix-org/spec-144-https-examples
SPEC-144 : Use https examples not http
2015-10-14 17:46:29 +01:00
Kegsay
dd5b41e99c Merge pull request #104 from matrix-org/spec-205-password-strength
SPEC-205: Warn about password strengths in m.login.password section
2015-10-14 17:45:42 +01:00
Kegan Dougal
e6eb19c461 Review comments 2015-10-14 17:34:25 +01:00
Kegan Dougal
1f2f14dc08 YAML tweaks 2015-10-14 17:07:25 +01:00