Mark Haines 9605593d11 Merge branch 'develop' into server2server_signing ...

Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py

2014-09-30 17:55:06 +01:00

..

events

Don't strip out null's in serialized events, as that is not need anymore and it's not in the spec (yet)

2014-09-25 17:00:17 +01:00

__init__.py

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

auth.py

Update docstring

2014-09-29 15:35:54 +01:00

constants.py

Added LoginType constants. Created general structure for processing registrations.

2014-09-15 10:23:20 +01:00

errors.py

Captchas now work on registration. Missing x-forwarded-for config arg support. Missing reloading a new captcha on the web client / displaying a sensible error message.

2014-09-05 19:18:23 -07:00

ratelimiting.py

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

urls.py

Add a _matrix/key/v1 resource with the verification keys of the local server

2014-09-23 18:43:34 +01:00