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

Conflicts:
	synapse/storage/appservice.py

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

..

schema

Use event IDs instead of dumping event content in the txns table.

2015-03-09 17:25:20 +00:00

__init__.py

Merge branch 'develop' into application-services-txn-reliability

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

_base.py

Bugfix to sql_txn_timer increment - add only the per-TXN duration, not the total time ever spent since boot

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

appservice.py

Merge branch 'develop' into application-services-txn-reliability

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

directory.py

Wrap all of get_app_service_rooms in a txn.

2015-03-02 11:20:51 +00:00

event_federation.py

Revert get_auth_chain changes

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

feedback.py

Add a description to storage layer's _execute_and_decode()

2015-03-11 17:08:57 +00:00

filtering.py

Blunty replace json with simplejson

2015-02-11 14:23:10 +00:00

keys.py

Appease pep8

2015-03-11 17:32:43 +00:00

media_repository.py

Update copyright notices

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

presence.py

Update copyright notices

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

profile.py

Update copyright notices

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

push_rule.py

Also give _execute() a description

2015-03-11 17:19:17 +00:00

pusher.py

Also give _execute() a description

2015-03-11 17:19:17 +00:00

registration.py

Also give _execute() a description

2015-03-11 17:19:17 +00:00

rejections.py

Initial implementation of auth conflict resolution

2015-01-29 16:52:33 +00:00

room.py

Also give _execute() a description

2015-03-11 17:19:17 +00:00

roommember.py

PEP8

2015-03-02 11:23:46 +00:00

signatures.py

Update copyright notices

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

state.py

Remove unused functions

2015-01-13 15:57:26 +00:00

stream.py

Wrap all of get_app_service_rooms in a txn.

2015-03-02 11:20:51 +00:00

transactions.py

Remove unused import

2015-02-23 18:17:43 +00:00