Mark Haines 4b63b06cad Merge branch 'develop' into storage_transactions ...

Conflicts:
	synapse/api/auth.py
	synapse/handlers/room.py
	synapse/storage/__init__.py

2014-08-26 16:07:05 +01:00

..

events

add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it

2014-08-13 03:32:18 +01:00

federation

Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server

2014-08-19 11:16:23 +01:00

handlers

Merge branch 'develop' into storage_transactions

2014-08-26 16:07:05 +01:00

rest

Fix ALL THE UNIT TESTS

2014-08-26 15:54:25 +01:00

storage

add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it

2014-08-13 03:32:18 +01:00

util

add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it

2014-08-13 03:32:18 +01:00

__init__.py

add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it

2014-08-13 03:32:18 +01:00

test_distributor.py

add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it

2014-08-13 03:32:18 +01:00

test_state.py

Fix some of the tests to reflect changes in the storage layer.

2014-08-15 17:42:21 +01:00

test_types.py

Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(..., hs=hs) - similar to parse_userid()

2014-08-13 18:03:41 +01:00

utils.py

Merge branch 'develop' into storage_transactions

2014-08-26 16:07:05 +01:00