Erik Johnston e0b7c521cb Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage ...

Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql

2015-01-30 14:08:28 +00:00

..

api

Code style fixes.

2015-01-29 16:12:40 +00:00

app

Merge branch 'develop' into pushers

2015-01-28 12:51:05 +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

Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage

2015-01-30 14:08:28 +00:00

federation

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

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

handlers

Merge pull request #36 from matrix-org/device_id_from_access_token

2015-01-28 17:19:28 +00:00

http

Merge branch 'develop' into pushers

2015-01-28 12:51:05 +00:00

push

Include content in notification pokes

2015-01-29 21:59:17 +00:00

rest

Renumber priority classes so we can use 0 for defaults.

2015-01-29 17:12:11 +00:00

storage

Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage

2015-01-30 14:08:28 +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

We do need Twisted 14, not 15: we use internal Twisted things that have been removed in 15.

2015-01-30 11:13:42 +00:00

server.py

Merge branch 'develop' into pushers

2015-01-28 12:51:05 +00:00

state.py

Remove commented line

2015-01-30 13:55:46 +00:00

types.py

Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier

2015-01-28 17:16:12 +00:00