Mark Haines 357dd1871d Merge branch 'develop' into storage_transactions ...

Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py

2014-08-27 17:28:55 +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

Move pdu and event persistence into a single persist_event function

2014-08-26 18:01:36 +01:00

handlers

Merge branch 'develop' into storage_transactions

2014-08-27 17:28:55 +01:00

rest

Merge branch 'develop' into storage_transactions

2014-08-27 16:54:12 +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

Start updating state handling to use snapshots

2014-08-27 15:11:51 +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

Fill out prev_events before calling persist_event

2014-08-27 14:32:19 +01:00