David Baker ed72fc3a50 Merge branch 'develop' into pushrules2 ...

Conflicts:
	synapse/storage/schema/pusher.sql

2015-03-04 15:24:21 +00:00

..

schema

Merge branch 'develop' into pushrules2

2015-03-04 15:24:21 +00:00

__init__.py

Note that we don't specify execution order

2015-03-04 15:10:05 +00:00

_base.py

Modify _simple_select_list to allow an empty WHERE clause. Use it for get_all_rooms and get_all_users.

2015-03-02 10:16:24 +00:00

appservice.py

Merge pull request #93 from matrix-org/application-services-exclusive

2015-03-02 14:56:32 +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

Update copyright notices

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

filtering.py

Blunty replace json with simplejson

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

keys.py

Update copyright notices

2015-01-06 13:21:39 +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

Use if not results rather than len, as per feedback.

2015-03-04 14:17:59 +00:00

pusher.py

Update pushers by app id and pushkey, not user id and pushkey

2015-02-13 16:16:16 +00:00

registration.py

Wrap all of get_app_service_rooms in a txn.

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

rejections.py

Initial implementation of auth conflict resolution

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

room.py

Wrap all of get_app_service_rooms in a txn.

2015-03-02 11:20:51 +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