forked-synapse/synapse/rest
Paul "LeoNerd" Evans 31a049eb69 Merge branch 'develop' into room-initial-sync
Conflicts:
	synapse/handlers/message.py
2014-11-17 16:59:24 +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 Add an EventValidator. Fix bugs in auth ++ storage 2014-11-10 18:25:42 +00: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 Fix pep8 warnings 2014-10-30 11:10:17 +00:00
register.py Fix pep8 warnings 2014-10-30 11:10:17 +00:00
room.py Merge branch 'develop' into room-initial-sync 2014-11-17 16:59:24 +00:00
transactions.py Fix pep8 warnings 2014-10-30 11:10:17 +00:00
voip.py Fix pep8 warnings 2014-10-30 11:10:17 +00:00