856 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Kegan Dougal	f450fc1db6	Typo	2015-10-19 13:32:43 +01:00
Kegan Dougal	e0fe3c42c8	Review comments	2015-10-16 14:19:00 +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
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
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
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	4170dbd5cf	Review comments	2015-10-13 11:29:54 +01:00
Kegan Dougal	173d00cea0	Review comments	2015-10-13 11:08:19 +01:00
Oddvar Lovaas	1cfe4f784f	special css for spec/howto	2015-10-12 19:57:41 +01:00
Oddvar Lovaas	ceebf34fca	generate docs with new nav bar	2015-10-12 19:11:35 +01:00
Daniel Wagner-Hall	98f225a974	Merge pull request #90 from matrix-org/daniel/speculator ... Checkout SHA of origin/master rather than merging	2015-10-12 18:19:55 +01:00
Daniel Wagner-Hall	c48abd93b9	Merge pull request #41 from matrix-org/daniel/threepidinvites-2 ... Specify third party room invites	2015-10-12 18:11:52 +01:00
Daniel Wagner-Hall	2502ca7ac6	Merge branch 'master' into daniel/threepidinvites-2 ... Conflicts: specification/targets.yaml	2015-10-12 18:11:01 +01:00
Daniel Wagner-Hall	4a1fb74897	Review comments	2015-10-12 18:08:51 +01:00
Kegsay	616f3990aa	Merge pull request #87 from matrix-org/module-push ... Push Module	2015-10-12 17:51:44 +01:00
Kegan Dougal	8f5c796884	Linkify 'pushers'	2015-10-12 17:50:46 +01:00
Oddvar Lovaas	89426c9322	typos and fixes	2015-10-09 17:43:46 +01:00
Kegan Dougal	e378de8379	Shuffle history visibility module to be in the module format	2015-10-09 11:04:11 +01:00
Daniel Wagner-Hall	6922850643	Add missing return	2015-10-09 11:02:27 +01:00
Daniel Wagner-Hall	b46f0e30b8	Checkout SHA of origin/master rather than merging	2015-10-09 11:02:00 +01:00
Daniel Wagner-Hall	481298db83	Revert "Checkout SHA of origin/master rather than merging" ... This reverts commit 0dbc6d8277.	2015-10-09 11:01:35 +01:00
Daniel Wagner-Hall	0dbc6d8277	Checkout SHA of origin/master rather than merging	2015-10-09 10:59:26 +01:00
Daniel Wagner-Hall	b7e98a263a	Merge pull request #89 from matrix-org/daniel/speculator ... speculator: Specify merge target	2015-10-09 10:48:24 +01:00
Daniel Wagner-Hall	a0cf485919	speculator: Specify merge target	2015-10-09 10:43:27 +01:00
Mark Haines	d6bdde4cee	Merge pull request #88 from matrix-org/markjh/initial_sync_archived_flag ... Add flag to initial sync to say we want rooms that the user has left	2015-10-09 10:28:40 +01:00
Oddvar Lovaas	51ab51ae26	Only documents in matrix-doc!	2015-10-08 19:27:08 +01:00
Mark Haines	d42c3195e6	Use 'true' rather than '1' for archived flag	2015-10-08 18:06:52 +01:00
Mark Haines	241096dc81	Add a flag to initial sync to indicate we want rooms that the user has left	2015-10-08 17:25:38 +01:00