anonymousland-synapse/synapse/rest
Erik Johnston bb4a20174c Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
	synapse/federation/transport.py
	synapse/handlers/message.py
2014-10-27 10:20:44 +00:00
..
__init__.py SYN-48: Implement WHOIS rest servlet 2014-09-29 14:59:52 +01:00
admin.py SYN-48: Fix typo. Get the whois for requested user rather tahan the requester 2014-09-29 15:04:04 +01:00
base.py Use state groups to get current state. Make join dance actually work. 2014-10-17 18:56:42 +01:00
directory.py SYN-2: Allow server admins to delete room aliases 2014-09-30 11:31:42 +01:00
events.py Use state groups to get current state. Make join dance actually work. 2014-10-17 18:56:42 +01:00
initial_sync.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
login.py Comment out password reset for now, until the mechanism is fully discussed (IS token auth vs HS auth) 2014-09-16 13:32:33 +01:00
presence.py Make sure to return an empty JSON object ({}) from presence PUT/POST requests rather than an empty string ("") because most deserialisers won't like the latter 2014-10-14 16:48:15 +01:00
profile.py Empty string is not a valid JSON object, so don't return them in HTTP responses. 2014-09-05 17:13:26 +01:00
register.py Track the IP users connect with. Add an admin column to users table. 2014-09-26 16:36:24 +01:00
room.py Merge branch 'deletions' of github.com:matrix-org/synapse into develop 2014-09-25 17:02:53 +01:00
transactions.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
voip.py Coturn's timestamps are in seconds, not milliseconds 2014-10-21 18:57:13 +01:00