David Baker c291a4d522 Merge branch 'develop' into pushers ...

Conflicts:
	synapse/handlers/events.py
	synapse/server.py

2015-01-28 12:51:05 +00:00

..

__init__.py

Merge branch 'develop' into pushers

2015-01-28 12:51:05 +00:00

admin.py

Extract the client v1 base RestServlet to a separate class

2015-01-23 14:09:51 +00:00

base.py

Extract the client v1 base RestServlet to a separate class

2015-01-23 14:09:51 +00:00

directory.py

Extract the client v1 base RestServlet to a separate class

2015-01-23 14:09:51 +00:00

events.py

Pass the current time to serialize event, rather than passing an

2015-01-26 16:11:28 +00:00

initial_sync.py

Extract the client v1 base RestServlet to a separate class

2015-01-23 14:09:51 +00:00

login.py

Extract the client v1 base RestServlet to a separate class

2015-01-23 14:09:51 +00:00

presence.py

Extract the client v1 base RestServlet to a separate class

2015-01-23 14:09:51 +00:00

profile.py

Extract the client v1 base RestServlet to a separate class

2015-01-23 14:09:51 +00:00

push_rule.py

Add API to delete push rules.

2015-01-23 17:49:37 +00:00

pusher.py

Merge branch 'develop' into pushers

2015-01-22 17:46:16 +00:00

register.py

Extract the client v1 base RestServlet to a separate class

2015-01-23 14:09:51 +00:00

room.py

Pass the current time to serialize event, rather than passing an

2015-01-26 16:11:28 +00:00

transactions.py

Move rest APIs back under the rest directory

2015-01-22 16:10:07 +00:00

voip.py

Extract the client v1 base RestServlet to a separate class

2015-01-23 14:09:51 +00:00