Commit graph

884 commits

Author SHA1 Message Date
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
Kegan Dougal ae90d15b3c Add m.room.avatar 2015-10-19 10:46:07 +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
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
Kegan Dougal 84af5776d7 Newlines 2015-10-14 17:02:39 +01:00
Erik Johnston 70704240dc gendoc should just add newlines rather than complaining about the lack thereof 2015-10-14 16:29:18 +01:00
Kegan Dougal 6a0595bc46 Add in size limits as per SPEC-222 2015-10-14 16:15:55 +01:00
Kegan Dougal f0d8052951 SPEC-205: Warn about password strengths in m.login.password section 2015-10-14 15:42:44 +01:00
Kegan Dougal 44b19a8b0e SPEC-165: Outline directory traversal attacks on MXC URIs 2015-10-14 15:27:56 +01:00
Kegan Dougal 45b1d08c7e SPEC-207: Add a warning about needing AS tokens to be unique and why 2015-10-14 15:16:12 +01:00
Richard van der Hoff a7332c8684 Merge pull request #98 from matrix-org/rav/speculator-readme
Add a note on building the speculator
2015-10-14 14:46:20 +01:00
Kegan Dougal 3608f3a282 SPEC-144 : Use https examples not http. 2015-10-14 14:44:09 +01:00
Richard van der Hoff 013b6db895 Add a note on building the speculator
... because the wiki says you need to read the README on how to build it.
2015-10-14 14:42:52 +01:00
Richard van der Hoff f02c33738f Merge pull request #97 from matrix-org/rav/speculator
Add richvdh to list of trusted pushers for spectulator
2015-10-14 14:34:05 +01:00
Richard van der Hoff 270e1d7aa8 Add richvdh to list of trusted pushers for spectulator
richvdh is awesome, he should have all the permissions.
2015-10-14 14:29:36 +01:00
Richard van der Hoff 4a9db39277 Clean up some untruths in the login api doc
add "type", and "username" -> "user"
2015-10-14 13:38:28 +01:00
Kegan Dougal 34bd8edec5 Move related auth sections together 2015-10-14 13:26:58 +01:00