13 commits

Author	SHA1	Message	Date
Kegan Dougal	a342867d3f	Added instructions for setting up captcha in an obviously named file.	2014-09-05 23:32:07 -07:00
Kegan Dougal	b5749c75d9	Reload captchas when they fail. Cleanup on success.	2014-09-05 23:08:39 -07:00
Kegan Dougal	c80f739461	Added webclient config.js for storing recaptcha public key.	2014-09-05 17:36:09 -07:00
Kegan Dougal	130458385e	Modified matrixService.register to specify if captcha results should be sent with the registration request. This is toggleable via useCaptcha in register-controller.	2014-09-05 13:56:36 -07:00
Kegan Dougal	0280176ccd	Added basic captcha, not hooked up	2014-09-05 13:31:47 -07:00
Emmanuel ROHEE	3ab8cfbc14	Fixed registration flow when registering with matrixID & password and no email	2014-09-04 14:04:35 +02:00
David Baker	d72ce4da64	Merge branch 'develop' of github.com:matrix-org/synapse into develop ... Conflicts: synapse/http/client.py	2014-09-03 18:25:17 +01:00
David Baker	a25d1530ef	Make registering and logging in with a threepid work in the webclient.	2014-09-03 18:23:56 +01:00
Matthew Hodgson	8a7c1d6a00	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
Emmanuel ROHEE	f81002df60	BF: Pass desired_user_id to register API. And update the app header to avoid to display the previous matrix id	2014-09-01 11:12:24 +02:00
Matthew Hodgson	df752a15ce	licenses, please...	2014-09-01 00:42:03 +01:00
Matthew Hodgson	7ca6d4e8f7	don't make HS ports explicit if it's the default for the protocol	2014-08-31 15:38:27 +01:00
Matthew Hodgson	3ef312fb95	factor out the signup process into its own controller	2014-08-31 00:38:10 +01:00