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 |