Mark Haines 396a67a09a Merge branch 'client_v2_filter' into client_v2_sync ...

Conflicts:
	synapse/rest/client/v2_alpha/__init__.py

2015-01-29 14:58:00 +00:00

..

api

Merge changes from develop

2015-01-29 14:55:27 +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

Include transaction ids in unsigned section of events in the sync results for the clients that made those requests

2015-01-29 02:46:00 +00:00

federation

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

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

handlers

Use get_room_events_stream to get changes to the rooms if the number of changes is small

2015-01-29 14:40:28 +00:00

http

Merge branch 'develop' into pushers

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

push

Easy on the newlines

2015-01-28 14:23:16 +00:00

rest

Merge branch 'client_v2_filter' into client_v2_sync

2015-01-29 14:58:00 +00:00

storage

Merge branch 'client_v2_filter' into client_v2_sync

2015-01-29 14:58:00 +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

Fix Formatting

2015-01-27 20:19:36 +00:00

python_dependencies.py

Stop complaining about Synapse Angular SDK 0.6.1

2015-01-23 18:37:37 +00:00

server.py

Merge changes from develop

2015-01-29 14:55:27 +00:00

state.py

Update copyright notices

2015-01-06 13:21:39 +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