Daniel Wagner-Hall 4d1ea40008 Merge branch 'develop' into redactyoself ...

Conflicts:
	synapse/handlers/_base.py

2015-08-28 15:35:39 +01:00

..

api

Allow users to redact their own events

2015-08-28 15:31:49 +01:00

app

Print the correct pip install line when failing due to lack of matrix-angular-sdk

2015-08-25 15:33:23 +01:00

appservice

Make the appservice use 'users_in_room' rather than get_room_members since it is cached

2015-05-22 11:01:28 +01:00

config

Merge branch 'release-v0.10.0' into develop

2015-08-28 11:15:27 +01:00

crypto

Remove syutil dependency in favour of smaller single-purpose libraries

2015-08-24 16:17:38 +01:00

events

Fix bug where we didn't correctly serialize the redacted_because key over federation

2015-08-21 09:36:07 +01:00

federation

Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation

2015-08-18 09:12:54 +01:00

handlers

Merge branch 'develop' into redactyoself

2015-08-28 15:35:39 +01:00

http

Remove syutil dependency in favour of smaller single-purpose libraries

2015-08-24 16:17:38 +01:00

metrics

Also check for presence of 'threadCallQueue' in reactor

2015-08-18 11:51:08 +01:00

push

Don't make pushers handle presence/typing events

2015-08-24 16:19:43 +01:00

rest

Merge branch 'release-v0.10.0' into develop

2015-08-28 11:15:27 +01:00

storage

Merge branch 'release-v0.10.0' into develop

2015-08-28 11:15:27 +01:00

streams

Wire together receipts and the notifer/federation

2015-07-07 15:25:30 +01:00

util

Allow non-ascii filenames for attachments

2015-08-26 16:26:37 +01:00

__init__.py

Bump version and changelog

2015-08-27 11:21:11 +01:00

notifier.py

Don't make pushers handle presence/typing events

2015-08-24 16:19:43 +01:00

python_dependencies.py

Merge branch 'release-v0.10.0' into develop

2015-08-28 11:15:27 +01:00

server.py

Correctly handle x_forwaded listener option

2015-06-12 17:13:23 +01:00

state.py

Move all the caches into their own package, synapse.util.caches

2015-08-11 18:00:59 +01:00

types.py

Remove completely unused concepts from codebase

2015-08-25 16:23:06 +01:00