Mark Haines f8b865264a Merge branch 'develop' into key_distribution ...

Conflicts:
	synapse/crypto/keyring.py

2015-04-27 18:29:32 +01:00

..

api

Merge branch 'develop' into key_distribution

2015-04-24 10:35:49 +01:00

app

Add a version 2 of the key server api

2015-04-14 16:04:52 +01:00

appservice

Fix more AS sender ID thinkos.

2015-04-01 14:05:24 +01:00

config

Add config for setting the perspective servers

2015-04-24 17:01:34 +01:00

crypto

Merge branch 'develop' into key_distribution

2015-04-27 18:29:32 +01:00

events

Store the rejected reason in (Frozen)Event structs

2015-03-25 19:06:05 +00:00

federation

Add missing servlet to list

2015-03-19 17:48:21 +00:00

handlers

Remove users from the remote_offline_serials list (and clean up empty elements) when they go online again

2015-04-23 19:01:37 +01:00

http

Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator

2015-04-21 16:35:53 +01:00

metrics

Appease pep8

2015-04-01 19:17:38 +01:00

push

Make one-to-one rule an underride otherwise bings don't work in one-to-one wrooms. Likewise a couple of other rules.

2015-04-24 14:27:17 +01:00

rest

Merge branch 'develop' into key_distribution

2015-04-27 18:29:32 +01:00

storage

Merge branch 'develop' into key_distribution

2015-04-24 10:35:49 +01:00

streams

Update copyright notices

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

util

Implement create_observer.

2015-04-27 13:59:37 +01:00

__init__.py

Bump version

2015-04-17 13:25:16 +01:00

notifier.py

Add comment

2015-04-09 11:42:21 +01:00

python_dependencies.py

Copyright notices

2015-04-24 10:35:29 +01:00

server.py

Add a version 2 of the key server api

2015-04-14 16:04:52 +01:00

state.py

Remove concept of context.auth_events, instead use context.current_state

2015-03-16 13:06:23 +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