Erik Johnston 8c652a2b5f When we see a difference in current state, actually use state conflict resolution algorithm

2015-02-13 14:20:05 +00:00

..

api

During room intial sync, only calculate current state once.

2015-02-09 17:41:29 +00:00

app

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

2015-02-11 10:35:13 +00:00

config

Add a cache for get_event

2015-02-11 15:01:15 +00:00

crypto

Blunty replace json with simplejson

2015-02-11 14:23:10 +00:00

events

pyflakes

2015-02-11 16:52:22 +00:00

federation

Fix logging

2015-02-12 19:29:43 +00:00

handlers

When we see a difference in current state, actually use state conflict resolution algorithm

2015-02-13 14:20:05 +00:00

http

Use encode_canonical_json for http client

2015-02-11 17:34:23 +00:00

push

Use encode_canonical_json for pushes

2015-02-11 17:32:42 +00:00

rest

Blunty replace json with simplejson

2015-02-11 14:23:10 +00:00

storage

Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0a

2015-02-12 14:51:46 +00:00

streams

Update copyright notices

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

util

Merge pull request #61 from matrix-org/timeout-federation-requests

2015-02-11 17:10:33 +00:00

__init__.py

Bump version

2015-02-13 13:33:37 +00:00

notifier.py

Fix Formatting

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

python_dependencies.py

Bump webclient version

2015-02-12 10:49:07 +00:00

server.py

Merge changes from develop

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

state.py

When we see a difference in current state, actually use state conflict resolution algorithm

2015-02-13 14:20:05 +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