Daniel Wagner-Hall 7e90fb6a57 Merge branch 'develop' into daniel/roomcleanupincremental ...

Conflicts:
	synapse/rest/client/v1/room.py

2016-02-17 15:53:59 +00:00

..

api

api/filtering: don't assume that event content will always be a dict

2016-02-17 12:59:41 +01:00

app

Fix up logcontexts

2016-02-08 14:26:45 +00:00

appservice

Fix flake8 warnings for new flake8

2016-02-02 17:18:50 +00:00

config

Derive macaroon_secret_key from signing key.

2016-02-08 16:35:44 +00:00

crypto

Fix up logcontexts

2016-02-08 14:26:45 +00:00

events

Atomically persit push actions when we persist the event

2016-02-09 16:19:15 +00:00

federation

Fix up logcontexts

2016-02-08 14:26:45 +00:00

handlers

Some cleanup

2016-02-17 15:50:13 +00:00

http

Catch the exceptions thrown by twisted when you write to a closed connection

2016-02-12 13:46:59 +00:00

metrics

copyrights

2016-01-07 04:26:29 +00:00

push

Atomically persit push actions when we persist the event

2016-02-09 16:19:15 +00:00

rest

Merge branch 'develop' into daniel/roomcleanupincremental

2016-02-17 15:53:59 +00:00

static/client

Updates to fallback CAS login to do new token login

2015-11-06 09:57:17 +00:00

storage

Merge branch 'develop' into daniel/roomcleanupincremental

2016-02-17 15:53:59 +00:00

streams

Clamp pagination limits to at most 1000

2016-01-14 10:22:02 +00:00

util

Merge pull request #566 from matrix-org/erikj/logcontext

2016-02-10 11:41:45 +00:00

__init__.py

Bump version and changelog

2016-02-11 16:04:15 +00:00

notifier.py

Fix up logcontexts

2016-02-08 14:26:45 +00:00

python_dependencies.py

Merge branch 'master' of git+ssh://github.com/matrix-org/synapse

2016-02-10 16:27:15 +00:00

server.py

Fix flake8 warnings for new flake8

2016-02-02 17:18:50 +00:00

state.py

Fix flake8 warnings for new flake8

2016-02-02 17:18:50 +00:00

types.py

Merge implementation of /join by alias or ID

2016-02-15 15:39:16 +00:00