David Baker 5c6189ea3e Merge branch 'develop' into pushers ...

Conflicts:
	synapse/rest/__init__.py

2015-01-22 17:46:16 +00:00

..

api

Oops: second part of commit dc938606

2015-01-22 17:38:53 +00:00

app

Merge branch 'develop' into pushers

2015-01-22 17:46:16 +00:00

config

Allow ':memory:' as the database path for sqlite3

2015-01-19 15:26:19 +00:00

crypto

Update copyright notices

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

events

Remove unused functions

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

federation

Finish renaming "context" to "room_id" in federation codebase

2015-01-16 19:01:03 +00:00

handlers

Merge branch 'develop' into pushers

2015-01-22 17:46:16 +00:00

http

Merge branch 'develop' into pushers

2015-01-22 17:46:16 +00:00

push

use underscores everywhere, not camelcase.

2015-01-20 11:52:08 +00:00

rest

Merge branch 'develop' into pushers

2015-01-22 17:46:16 +00:00

storage

Merge branch 'develop' into pushers

2015-01-22 17:46:16 +00:00

streams

Update copyright notices

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

util

Optimize FrozenEvent creation

2015-01-06 18:51:03 +00:00

__init__.py

Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop

2015-01-13 10:01:22 +00:00

notifier.py

Only start the notifier timeout once we've had a chance to check for updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have

2015-01-19 16:24:54 +00:00

python_dependencies.py

Check the existance and versions of necessary modules when starting synapse, log which modules are used

2015-01-08 17:08:57 +00:00

server.py

Merge branch 'develop' into pushers

2015-01-22 17:46:16 +00:00

state.py

Update copyright notices

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

types.py

Update copyright notices

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