David Baker b56730bb6e Merge branch 'develop' into pushers ...

Conflicts:
	synapse/api/errors.py
	synapse/server.py
	synapse/storage/__init__.py

2014-12-18 15:15:22 +00:00

..

api

Merge branch 'develop' into pushers

2014-12-18 15:15:22 +00:00

app

Merge branch 'develop' into pushers

2014-12-18 15:15:22 +00:00

config

SYN-142: Use a default log file 'homeserver.log' so people get logging by default.

2014-12-16 17:24:49 +00:00

crypto

Try and figure out how and why signatures are being changed.

2014-12-10 11:37:47 +00:00

events

clean up coding style a bit

2014-12-16 15:24:03 +00:00

federation

Kill off synapse.api.events.*

2014-12-16 11:29:05 +00:00

handlers

Merge branch 'release-v0.6.0' into develop

2014-12-16 17:29:49 +00:00

http

Merge branch 'develop' into pushers

2014-12-18 15:15:22 +00:00

media

clean up coding style a bit

2014-12-16 15:24:03 +00:00

push

after a few rethinks, a working implementation of pushers.

2014-12-18 14:49:22 +00:00

rest

Merge branch 'develop' into pushers

2014-12-18 15:15:22 +00:00

storage

Merge branch 'develop' into pushers

2014-12-18 15:15:22 +00:00

streams

Allow GET /room/:room_id/messages without 'limit' parameter to default to 10

2014-12-02 18:01:16 +00:00

util

Fix pyflakes

2014-12-16 13:41:43 +00:00

__init__.py

Bump version

2014-12-16 13:57:27 +00:00

notifier.py

Remember to hook up the typing event stream to the notifier as well

2014-12-15 16:14:53 +00:00

server.py

Merge branch 'develop' into pushers

2014-12-18 15:15:22 +00:00

state.py

Merge branch 'release-v0.6.0' into develop

2014-12-16 17:29:49 +00:00

types.py

Change DomainSpecificString so that it doesn't use a HomeServer object

2014-12-02 10:42:28 +00:00