Kegan Dougal f9232c7917 Merge branch 'develop' into application-services-txn-reliability ...

Conflicts:
	synapse/storage/appservice.py

2015-03-16 10:09:15 +00:00

..

__init__.py

Use seconds; start gluing in the AS scheduler into the AS handler.

2015-03-09 17:01:19 +00:00

_base.py

Replace hs.parse_userid with UserID.from_string

2015-01-23 11:47:15 +00:00

admin.py

Update copyright notices

2015-01-06 13:21:39 +00:00

appservice.py

Use seconds; start gluing in the AS scheduler into the AS handler.

2015-03-09 17:01:19 +00:00

directory.py

Implement exclusive namespace checks.

2015-02-27 13:51:41 +00:00

events.py

Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This uses the a storage api that is cached.

2015-03-09 16:43:09 +00:00

federation.py

Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu

2015-02-23 14:36:00 +00:00

login.py

Modify API for SimpleHttpClient.get_json and update usages.

2015-02-04 17:07:31 +00:00

message.py

Reindent code to be less human-readable to keep pep8 from complaining

2015-02-12 19:19:37 +00:00

presence.py

Appease pep8

2015-03-12 16:24:51 +00:00

profile.py

Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This uses the a storage api that is cached.

2015-03-09 16:43:09 +00:00

register.py

Implement exclusive namespace checks.

2015-02-27 13:51:41 +00:00

room.py

Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This uses the a storage api that is cached.

2015-03-09 16:43:09 +00:00

sync.py

Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This uses the a storage api that is cached.

2015-03-09 16:43:09 +00:00

typing.py

We do want to consumeError

2015-02-17 11:11:11 +00:00